From dd0e9300fb63d77b714b22d4a97d6e4d18e3d48f Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 15 Sep 2019 15:18:11 +0200 Subject: [PATCH] nm -> hiera role; explicitly include apache2 --- hieradata/common.yaml | 2 -- hieradata/nodes/nono.debian.org.yaml | 3 +++ modules/roles/manifests/init.pp | 4 ---- modules/roles/manifests/nm.pp | 9 +++++---- 4 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 hieradata/nodes/nono.debian.org.yaml diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 546293630..a4f01d567 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -72,8 +72,6 @@ roles: - menotti.debian.org nagiosmaster: - tchaikovsky.debian.org - nm: - - nono.debian.org packages: - picconi.debian.org - pkgmirror-csail.debian.org diff --git a/hieradata/nodes/nono.debian.org.yaml b/hieradata/nodes/nono.debian.org.yaml new file mode 100644 index 000000000..6f30e7f7a --- /dev/null +++ b/hieradata/nodes/nono.debian.org.yaml @@ -0,0 +1,3 @@ +--- +classes: + - roles::nm diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index 6afdaa4f6..ca72b6b89 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -123,10 +123,6 @@ class roles { include roles::contributors } - if has_role('nm') { - include roles::nm - } - if has_role('postgres_backup_server') { include postgres::backup_server } diff --git a/modules/roles/manifests/nm.pp b/modules/roles/manifests/nm.pp index 3a8ee2fc5..262bb20c8 100644 --- a/modules/roles/manifests/nm.pp +++ b/modules/roles/manifests/nm.pp @@ -1,6 +1,7 @@ class roles::nm { - ssl::service { 'nm.debian.org': - notify => Exec['service apache2 reload'], - key => true, - } + include apache2 + ssl::service { 'nm.debian.org': + notify => Exec['service apache2 reload'], + key => true, + } } -- 2.20.1