diff options
| author | varac <varacanero@zeromail.org> | 2015-10-05 15:22:25 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-10-06 11:07:35 +0200 |
| commit | 276b77cdcc0d169b84e046afe8763e2c52ff76fb (patch) | |
| tree | d0d7ee2e7f0953df2be7d2a1fd55340e6ccffd90 /puppet/modules/site_config/manifests/default.pp | |
| parent | 133ba7d5af1659458996ef4f2d1cb8919b438394 (diff) | |
[feat] remove tapicero leftovers
Soledad now creates user-dbs, which has been done by tapicero
in the past. we need to remove any leftovers from tapicero.
Diffstat (limited to 'puppet/modules/site_config/manifests/default.pp')
| -rw-r--r-- | puppet/modules/site_config/manifests/default.pp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp index e69e4b7b..6b10dc19 100644 --- a/puppet/modules/site_config/manifests/default.pp +++ b/puppet/modules/site_config/manifests/default.pp @@ -1,3 +1,4 @@ +# common things to set up on every node class site_config::default { tag 'leap_base' @@ -29,7 +30,7 @@ class site_config::default { # i.e. openstack/aws nodes, vagrant nodes # fix dhclient from changing resolver information - if $::dhcp_enabled == 'true' { + if $::dhcp_enabled == 'true' { include site_config::dhclient } @@ -58,7 +59,9 @@ class site_config::default { # set up core leap files and directories include site_config::files - include site_config::remove_files + + # remove leftovers from previous deploys + include site_config::remove if ! member($services, 'mx') { include site_postfix::satellite |