diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | manifests/bootstrap/configurator.pp (renamed from manifests/classes/configurator.pp) | 0 | ||||
| -rw-r--r-- | manifests/bootstrap/host.pp (renamed from manifests/host.pp) | 2 | ||||
| -rw-r--r-- | manifests/bootstrap/master.pp (renamed from manifests/master.pp) | 2 | ||||
| -rw-r--r-- | manifests/bootstrap/vagrant.pp (renamed from manifests/vagrant.pp) | 2 |
5 files changed, 5 insertions, 5 deletions
@@ -37,10 +37,10 @@ remote: config: $(EDITOR) hiera/bootstrap.yaml - $(PUPPET) manifests/classes/configurator.pp + $(PUPPET) manifests/bootstrap/configurator.pp apply: - $(PUPPET) manifests/$(stage).pp + $(PUPPET) manifests/bootstrap/$(stage).pp clean: rm -rf modules diff --git a/manifests/classes/configurator.pp b/manifests/bootstrap/configurator.pp index cf2d891..cf2d891 100644 --- a/manifests/classes/configurator.pp +++ b/manifests/bootstrap/configurator.pp diff --git a/manifests/host.pp b/manifests/bootstrap/host.pp index ea23fb4..c1aead8 100644 --- a/manifests/host.pp +++ b/manifests/bootstrap/host.pp @@ -5,7 +5,7 @@ # # Import site configuration -import "site.pp" +import "../site.pp" # The server role include nodo::role::server diff --git a/manifests/master.pp b/manifests/bootstrap/master.pp index f53f00e..51167f3 100644 --- a/manifests/master.pp +++ b/manifests/bootstrap/master.pp @@ -6,7 +6,7 @@ # # Import site configuration -import "site.pp" +import "../site.pp" # Include the master node configuration include nodo::role::master diff --git a/manifests/vagrant.pp b/manifests/bootstrap/vagrant.pp index 7e6c6c7..9206db6 100644 --- a/manifests/vagrant.pp +++ b/manifests/bootstrap/vagrant.pp @@ -4,7 +4,7 @@ # # Import site configuration -import "site.pp" +import "../site.pp" # # Stage definitions |