pet -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 66f1bbd..4043308 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -216,8 +216,6 @@ roles:
     - tye.debian.org
   l10n.d.o:
     - tye.debian.org
-  pet.d.n:
-    - petrova.debian.org
   ports_master:
     - porta.debian.org
   onionbalance:

diff --git a/hieradata/nodes/petrova.debian.org.yaml b/hieradata/nodes/petrova.debian.org.yaml
new file mode 100644 (file)
index 0000000..b884b01
--- /dev/null
+++ b/hieradata/nodes/petrova.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::pet

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 438c5a7..4c07c5a 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -173,11 +173,6 @@ class roles {
                ssl::service { 'l10n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
 
-       if has_role('pet.d.n') {
-               ssl::service { 'pet.debian.net': notify  => Exec['service apache2 reload'], key => true, }
-               ssl::service { 'pet-devel.debian.net': notify  => Exec['service apache2 reload'], key => true, }
-       }
-
        if has_role('ports_master') {
                include roles::ports_master
        }

diff --git a/modules/roles/manifests/pet.pp b/modules/roles/manifests/pet.pp
new file mode 100644 (file)
index 0000000..c382808
--- /dev/null
+++ b/modules/roles/manifests/pet.pp
@@ -0,0 +1,5 @@
+class roles::pet {
+  include apache2
+  ssl::service { 'pet.debian.net': notify  => Exec['service apache2 reload'], key => true, }
+  ssl::service { 'pet-devel.debian.net': notify  => Exec['service apache2 reload'], key => true, }
+}