From f577b6babf3b6c16f6783d037ce7acd4ed119557 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 18:26:40 +0200
Subject: [PATCH] git_master -> hiera role

---
 hieradata/common.yaml                       |  2 --
 hieradata/nodes/adayevskaya.debian.org.yaml |  2 ++
 modules/roles/manifests/git_master.pp       | 21 ++++++++++-----------
 modules/roles/manifests/init.pp             |  4 ----
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 00b256df9..4a637e13f 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -45,8 +45,6 @@ roles:
     - denis.debian.org
   ftp_master:
     - fasolo.debian.org
-  git_master:
-    - adayevskaya.debian.org
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
diff --git a/hieradata/nodes/adayevskaya.debian.org.yaml b/hieradata/nodes/adayevskaya.debian.org.yaml
index 60305f14e..38759083b 100644
--- a/hieradata/nodes/adayevskaya.debian.org.yaml
+++ b/hieradata/nodes/adayevskaya.debian.org.yaml
@@ -1,2 +1,4 @@
+---
 classes:
   - roles::dsa_gitolite
+  - roles::git_master
diff --git a/modules/roles/manifests/git_master.pp b/modules/roles/manifests/git_master.pp
index a265ed267..a432f0265 100644
--- a/modules/roles/manifests/git_master.pp
+++ b/modules/roles/manifests/git_master.pp
@@ -7,17 +7,16 @@
 #   include roles::git_master
 #
 class roles::git_master {
+  include roles::pubsub::parameters
 
-	include roles::pubsub::parameters
+  $rabbit_password = $roles::pubsub::parameters::rabbit_password
 
-	$rabbit_password = $roles::pubsub::parameters::rabbit_password
-
-	roles::pubsub::config { 'emailvdomains':
-		key      => 'dsa-emailvdomains',
-		exchange => dsa,
-		topic    => 'dsa.email.update',
-		vhost    => dsa,
-		username => $::fqdn,
-		password => $rabbit_password
-	}
+  roles::pubsub::config { 'emailvdomains':
+    key      => 'dsa-emailvdomains',
+    exchange => dsa,
+    topic    => 'dsa.email.update',
+    vhost    => dsa,
+    username => $::fqdn,
+    password => $rabbit_password
+  }
 }
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 4e4a9a27d..2afec7f93 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -45,10 +45,6 @@ class roles {
 		include roles::security_mirror
 	}
 
-	if has_role('git_master') {
-		include roles::git_master
-	}
-
 	if has_role('wiki') {
 		include roles::wiki
 	}
-- 
2.20.1