diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-04-28 15:15:44 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-04-28 15:15:44 +0200 |
| commit | 59e6672eaacaa29a5f5372c39dcd6a2fd9078e46 (patch) | |
| tree | 11426d8a18edbb1e6566d89895486f62e0c240b9 | |
| parent | 4714b3c9cc8df06171cb0eb77943d1b79bcf1fc5 (diff) | |
| parent | 5d110ba1a1e8b2e0e7ab2cb0499940df86aebad3 (diff) | |
| download | Puppet-59e6672eaacaa29a5f5372c39dcd6a2fd9078e46.tar.gz Puppet-59e6672eaacaa29a5f5372c39dcd6a2fd9078e46.tar.zst Puppet-59e6672eaacaa29a5f5372c39dcd6a2fd9078e46.zip | |
Merge branch 'dev'
| -rw-r--r-- | manifests/site.pp | 2 | ||||
| -rw-r--r-- | modules/base_installation/manifests/services.pp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/site.pp b/manifests/site.pp index 3d40ad2..11bc9ca 100644 --- a/manifests/site.pp +++ b/manifests/site.pp | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | node default { | 1 | node default { |
| 2 | lookup('classes').each |$class_name, $class_hash| { | 2 | lookup('classes').each |$class_name, $class_hash| { |
| 3 | if empty($class_hash) { | 3 | if $class_hash == undef or empty($class_hash) { |
| 4 | include $class_name | 4 | include $class_name |
| 5 | } else { | 5 | } else { |
| 6 | class { $class_name: | 6 | class { $class_name: |
diff --git a/modules/base_installation/manifests/services.pp b/modules/base_installation/manifests/services.pp index 57fbfc3..1659f97 100644 --- a/modules/base_installation/manifests/services.pp +++ b/modules/base_installation/manifests/services.pp | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | class base_installation::services inherits base_installation { | 1 | class base_installation::services inherits base_installation { |
| 2 | 2 | ||
| 3 | if (empty($facts["in_chroot"])) { | 3 | if $facts["in_chroot"] == undef or empty($facts["in_chroot"]) { |
| 4 | $ensure = "running" | 4 | $ensure = "running" |
| 5 | } else { | 5 | } else { |
| 6 | $ensure = undef | 6 | $ensure = undef |