From 7ee1426fd0c8731e4551b1191db15172f4d9e072 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 15 Sep 2019 10:18:03 +0200 Subject: [PATCH] debconf_wafer -> hiera role --- hieradata/common.yaml | 2 -- hieradata/nodes/debussy.debian.org.yaml | 4 ++++ modules/roles/manifests/init.pp | 4 ---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index fb057a563..ec348c4b8 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -288,8 +288,6 @@ roles: - vittoria.debian.org debsources: - sor.debian.org - debconf_wafer: - - debussy.debian.org apache_ratelimited: - beach.debian.org - buxtehude.debian.org diff --git a/hieradata/nodes/debussy.debian.org.yaml b/hieradata/nodes/debussy.debian.org.yaml index c9756e7f7..fa42edece 100644 --- a/hieradata/nodes/debussy.debian.org.yaml +++ b/hieradata/nodes/debussy.debian.org.yaml @@ -1 +1,5 @@ +--- +classes: + - roles::debconf_wafer + ssl::insecure_ssl: true diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index 6b9af9b93..8ce734b2a 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -288,8 +288,4 @@ class roles { if has_role('debsources') { include roles::debsources } - - if has_role('debconf_wafer') { - include roles::debconf_wafer - } } -- 2.20.1