diff options
| author | Jesse Luehrs <doy@tozt.net> | 2018-11-13 00:29:30 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2018-11-13 00:33:24 -0500 |
| commit | 8cbc72093f0f1b100a61a29a9bd38280ee9cfbc0 (patch) | |
| tree | ff9193d8d3b5ba3ba150a57c8a41146850587ebc | |
| parent | bf33ac997636c4b6c199cfff1e171ffaff437c91 (diff) | |
| download | puppet-tozt-8cbc72093f0f1b100a61a29a9bd38280ee9cfbc0.tar.gz puppet-tozt-8cbc72093f0f1b100a61a29a9bd38280ee9cfbc0.zip | |
try moving to manifests and nodes
| -rwxr-xr-x | bin/helpers/launch-tozt | 2 | ||||
| -rw-r--r-- | manifests/tozt.pp (renamed from modules/tozt/manifests/init.pp) | 2 | ||||
| -rw-r--r-- | modules/tozt/files/puppet-tozt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/bin/helpers/launch-tozt b/bin/helpers/launch-tozt index 7b23894..0d93aac 100755 --- a/bin/helpers/launch-tozt +++ b/bin/helpers/launch-tozt @@ -66,6 +66,6 @@ fi ensure_conf_exists scp -r /mnt/puppet/tozt/ root@"$host":/usr/local/share/puppet-tozt/modules/secret/files -remote "cd '$conf_location' && puppet apply --modulepath=./modules -e 'include tozt'" +remote "cd '$conf_location' && puppet apply --modulepath=./modules manifests" echo "Done" diff --git a/modules/tozt/manifests/init.pp b/manifests/tozt.pp index f7997da..85e0204 100644 --- a/modules/tozt/manifests/init.pp +++ b/manifests/tozt.pp @@ -1,4 +1,4 @@ -class tozt { +node 'tozt.localdomain' { include tozt::users Package::Makepkg { diff --git a/modules/tozt/files/puppet-tozt b/modules/tozt/files/puppet-tozt index 4ea27ef..6d06998 100644 --- a/modules/tozt/files/puppet-tozt +++ b/modules/tozt/files/puppet-tozt @@ -3,4 +3,4 @@ set -eu set -o pipefail (cd /usr/local/share/puppet-tozt && sudo git pull) -sudo puppet apply --show_diff --modulepath=/usr/local/share/puppet-tozt/modules -e 'include tozt' +sudo puppet apply --show_diff --modulepath=/usr/local/share/puppet-tozt/modules /usr/local/share/puppet-tozt/manifests |