diff options
author | Micah Anderson <micah@leap.se> | 2014-06-19 14:12:08 -0400 |
---|---|---|
committer | Micah Anderson <micah@leap.se> | 2014-06-19 14:12:08 -0400 |
commit | 9198af78956972a01aaf85e19753c5c9e62ea018 (patch) | |
tree | 7c2c4901c92528b2fababb0e4283d5bec6cd1aef /puppet/modules/site_config/manifests/default.pp | |
parent | 6100b6ded99241f10e7fb12c13a0820fda084912 (diff) | |
parent | f991e8a4c877cff1d274fd1cac26488f8c3fda84 (diff) |
Merge tag '0.5.2'
tagging 0.5.2 release
Diffstat (limited to 'puppet/modules/site_config/manifests/default.pp')
-rw-r--r-- | puppet/modules/site_config/manifests/default.pp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp index c7352857..fc2179de 100644 --- a/puppet/modules/site_config/manifests/default.pp +++ b/puppet/modules/site_config/manifests/default.pp @@ -1,6 +1,7 @@ class site_config::default { tag 'leap_base' + $services = hiera('services', []) $domain_hash = hiera('domain') include site_config::params @@ -18,7 +19,7 @@ class site_config::default { include site_config::sysctl # configure ssh and include ssh-keys - include site_config::sshd + include site_sshd # include classes for special environments # i.e. openstack/aws nodes, vagrant nodes @@ -54,7 +55,7 @@ class site_config::default { # set up core leap files and directories include site_config::files - if $::services !~ /\bmx\b/ { + if ! member($services, 'mx') { include site_postfix::satellite } |