From 01c98dc114f445a08e3b0c71934fb5ff87d39e20 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 14 Sep 2019 23:36:27 +0200 Subject: [PATCH] salsa -> hiera role --- hieradata/common.yaml | 2 -- hieradata/nodes/godard.debian.org.yaml | 2 ++ modules/roles/manifests/init.pp | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) create mode 100644 hieradata/nodes/godard.debian.org.yaml diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 5a199d53b..e4160698f 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -309,8 +309,6 @@ roles: - seger.debian.org - snapshotdb-manda-01.debian.org - vittoria.debian.org - salsa.debian.org: - - godard.debian.org insecure_ssl: - debussy.debian.org - godard.debian.org diff --git a/hieradata/nodes/godard.debian.org.yaml b/hieradata/nodes/godard.debian.org.yaml new file mode 100644 index 000000000..02bd9124c --- /dev/null +++ b/hieradata/nodes/godard.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - salsa diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index 6f06d746d..d75913e00 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -316,10 +316,6 @@ class roles { include bacula::storage } - if has_role('salsa.debian.org') { - include salsa - } - if $::keyring_debian_org_mirror { include roles::keyring_debian_org_mirror } -- 2.20.1