From e71099e47c57303bb7090e404db84ad3e8d3b75b Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 15 Sep 2019 15:02:50 +0200 Subject: [PATCH] hiera -> hiera role; explicitly include apache2 --- hieradata/common.yaml | 2 -- hieradata/nodes/draghi.debian.org.yaml | 3 +++ modules/roles/manifests/dbmaster.pp | 1 + modules/roles/manifests/init.pp | 4 ---- 4 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 hieradata/nodes/draghi.debian.org.yaml diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 97997eaf0..902da87ff 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -37,8 +37,6 @@ roles: - buxtehude.debian.org contributors: - nono.debian.org - dbmaster: - - draghi.debian.org debtags: - tate.debian.org dns_primary: diff --git a/hieradata/nodes/draghi.debian.org.yaml b/hieradata/nodes/draghi.debian.org.yaml new file mode 100644 index 000000000..a2da6fda0 --- /dev/null +++ b/hieradata/nodes/draghi.debian.org.yaml @@ -0,0 +1,3 @@ +--- +classes: + - roles::dbmaster diff --git a/modules/roles/manifests/dbmaster.pp b/modules/roles/manifests/dbmaster.pp index 1bd9d2b06..f7b5a2645 100644 --- a/modules/roles/manifests/dbmaster.pp +++ b/modules/roles/manifests/dbmaster.pp @@ -7,6 +7,7 @@ # include roles::dbmaster # class roles::dbmaster { + include apache2 include roles::pubsub::parameters diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index c8842fa02..948127faa 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -91,10 +91,6 @@ class roles { include roles::pubsub } - if has_role('dbmaster') { - include roles::dbmaster - } - if has_role('dns_primary') { include roles::dns_primary } -- 2.20.1