diff options
Diffstat (limited to '')
-rw-r--r-- | manifests/client.pp | 9 | ||||
-rw-r--r-- | manifests/puppetagent.pp | 13 | ||||
-rw-r--r-- | manifests/puppetserver.pp | 5 |
3 files changed, 18 insertions, 9 deletions
diff --git a/manifests/client.pp b/manifests/client.pp deleted file mode 100644 index f0a9b93..0000000 --- a/manifests/client.pp +++ /dev/null @@ -1,9 +0,0 @@ -class profiles::client { - - class { 'puppet': - server => false, - agent => true, - puppetmaster => $facts['extlib__puppet_config']['main']['server'], - } - -} diff --git a/manifests/puppetagent.pp b/manifests/puppetagent.pp new file mode 100644 index 0000000..3e65c8b --- /dev/null +++ b/manifests/puppetagent.pp @@ -0,0 +1,13 @@ +class profiles::puppetagent { + if defined(Class['profiles::puppetserver']) { + fail('Can only either be puppetagent or puppetserver (which is also a puppetagent), not both') + } + + class { 'puppet': + server => false, + agent => true, + show_diff => true, + puppetmaster => $facts['extlib__puppet_config']['main']['server'], + } + +} diff --git a/manifests/puppetserver.pp b/manifests/puppetserver.pp index 80cf8f9..20bb69d 100644 --- a/manifests/puppetserver.pp +++ b/manifests/puppetserver.pp @@ -3,6 +3,11 @@ class profiles::puppetserver ( # ourselves Hash $hiera, ) { + + if defined(Class['profiles::puppetagent']) { + fail('Can only either be puppetagent or puppetserver (which is also a puppetagent), not both') + } + # required for the git hook ensure_packages(['ruby']) |