diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-06-29 16:49:15 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-06-29 16:49:15 -0300 |
| commit | 3730114dbb3dffa0d496ff5aaf42c8d54bee8f80 (patch) | |
| tree | 7987115345b6e5e9c1e95c38a517d5ba9bd40620 /manifests/bootstrap | |
| parent | 106977f49e6dbc925179ec2bded5455f45607189 (diff) | |
| download | puppet-bootstrap-3730114dbb3dffa0d496ff5aaf42c8d54bee8f80.tar.gz puppet-bootstrap-3730114dbb3dffa0d496ff5aaf42c8d54bee8f80.tar.bz2 | |
More changes for puppet 3.x
Diffstat (limited to 'manifests/bootstrap')
| -rw-r--r-- | manifests/bootstrap/configurator.pp | 2 | ||||
| -rw-r--r-- | manifests/bootstrap/host.pp | 3 | ||||
| -rw-r--r-- | manifests/bootstrap/master.pp | 3 |
3 files changed, 1 insertions, 7 deletions
diff --git a/manifests/bootstrap/configurator.pp b/manifests/bootstrap/configurator.pp index d93a0ce..edcbe92 100644 --- a/manifests/bootstrap/configurator.pp +++ b/manifests/bootstrap/configurator.pp @@ -74,7 +74,7 @@ file { "$bootstrap_path/auth.conf": # # Basic users # -file { "$bootstrap_path/manifests/classes/users.pp": +file { "$bootstrap_path/modules/site_users/manifests/init.pp": ensure => present, mode => 0644, content => template("$templates/puppet/users.pp.erb"), diff --git a/manifests/bootstrap/host.pp b/manifests/bootstrap/host.pp index c1aead8..c403eea 100644 --- a/manifests/bootstrap/host.pp +++ b/manifests/bootstrap/host.pp @@ -4,9 +4,6 @@ # virtual machine. # -# Import site configuration -import "../site.pp" - # The server role include nodo::role::server diff --git a/manifests/bootstrap/master.pp b/manifests/bootstrap/master.pp index 51167f3..73c075c 100644 --- a/manifests/bootstrap/master.pp +++ b/manifests/bootstrap/master.pp @@ -5,8 +5,5 @@ # Once it's running it can setup all the other nodes. # -# Import site configuration -import "../site.pp" - # Include the master node configuration include nodo::role::master |