git_master -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 00b256d..4a637e1 100644 (file)
--- 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 60305f1..3875908 100644 (file)
--- 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 a265ed2..a432f02 100644 (file)
--- 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 4e4a9a2..2afec7f 100644 (file)
--- 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
        }