From: Peter Palfrader Date: Sun, 15 Sep 2019 14:08:35 +0000 (+0200) Subject: pubsub -> hiera role X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e1e34a864356089814686caf3a2fbce193ded6ff;p=mirror%2Fdsa-puppet.git pubsub -> hiera role --- diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 7796a1bbe..ca45b2db3 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -73,9 +73,6 @@ roles: - quantz.debian.org popcon: - pinel.debian.org - pubsub: - - rainier.debian.org - - rapoport.debian.org qamaster: - quantz.debian.org rtmaster: diff --git a/hieradata/nodes/rainier.debian.org.yaml b/hieradata/nodes/rainier.debian.org.yaml new file mode 100644 index 000000000..b2dd38424 --- /dev/null +++ b/hieradata/nodes/rainier.debian.org.yaml @@ -0,0 +1,3 @@ +--- +classes: + - roles::pubsub diff --git a/hieradata/nodes/rapoport.debian.org.yaml b/hieradata/nodes/rapoport.debian.org.yaml new file mode 100644 index 000000000..b2dd38424 --- /dev/null +++ b/hieradata/nodes/rapoport.debian.org.yaml @@ -0,0 +1,3 @@ +--- +classes: + - roles::pubsub diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index d298086e4..63ec89d9b 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -78,10 +78,6 @@ class roles { include roles::mailrelay } - if has_role('pubsub') { - include roles::pubsub - } - if has_role('dns_primary') { include roles::dns_primary }