From 2468a6ba4deb816477602d45c3a46f2c3b61c722 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 8 Sep 2019 15:53:00 +0200 Subject: [PATCH] Make jenkins a proper role --- hieradata/common.yaml | 2 -- hieradata/nodes/jerea.debian.org.yaml | 2 ++ modules/roles/manifests/init.pp | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) create mode 100644 hieradata/nodes/jerea.debian.org.yaml diff --git a/hieradata/common.yaml b/hieradata/common.yaml index d62a933bd..83225d80d 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -57,8 +57,6 @@ roles: - adayevskaya.debian.org historicalpackages: - hier.debian.org - jenkins: - - jerea.debian.org keyring: - kaufmann.debian.org lists: diff --git a/hieradata/nodes/jerea.debian.org.yaml b/hieradata/nodes/jerea.debian.org.yaml new file mode 100644 index 000000000..6379d1450 --- /dev/null +++ b/hieradata/nodes/jerea.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::jenkins diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index ae258efc6..3960f1ed3 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -205,10 +205,6 @@ class roles { include roles::rtc } - if has_role('jenkins') { - include roles::jenkins - } - if has_role('postgres_backup_server') { include postgres::backup_server } -- 2.20.1