From b9291c6881cb7ac5f90b3329955f61792ba6ee04 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 15 Sep 2019 20:30:00 +0200 Subject: [PATCH] snapshot_web -> hiera role --- hieradata/common.yaml | 3 --- hieradata/nodes/lw07.debian.org.yaml | 3 +++ hieradata/nodes/sallinen.debian.org.yaml | 3 +++ modules/roles/manifests/init.pp | 4 ---- 4 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 hieradata/nodes/lw07.debian.org.yaml create mode 100644 hieradata/nodes/sallinen.debian.org.yaml diff --git a/hieradata/common.yaml b/hieradata/common.yaml index c4ccc91ba..b24dc1b2b 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -179,9 +179,6 @@ roles: - seger.debian.org - snapshotdb-manda-01.debian.org - vittoria.debian.org - snapshot_web: - - lw07.debian.org - - sallinen.debian.org classes: - base::includes diff --git a/hieradata/nodes/lw07.debian.org.yaml b/hieradata/nodes/lw07.debian.org.yaml new file mode 100644 index 000000000..1244b0c76 --- /dev/null +++ b/hieradata/nodes/lw07.debian.org.yaml @@ -0,0 +1,3 @@ +--- +classes: + - roles::snapshot_web diff --git a/hieradata/nodes/sallinen.debian.org.yaml b/hieradata/nodes/sallinen.debian.org.yaml new file mode 100644 index 000000000..1244b0c76 --- /dev/null +++ b/hieradata/nodes/sallinen.debian.org.yaml @@ -0,0 +1,3 @@ +--- +classes: + - roles::snapshot_web diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index fefab3fe4..583ad92db 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -78,10 +78,6 @@ class roles { include roles::snapshot } - if has_role('snapshot_web') { - include roles::snapshot_web - } - if has_role('ports_master') { include roles::ports_master } -- 2.20.1