Install new apache on draghi

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 7743e41..54bc428 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -238,3 +238,5 @@ roles:
     - porta.debian.org
   onionbalance:
     - olin.debian.org
+  experimental_apache:
+    - draghi.debian.org

diff --git a/modules/debian-org/manifests/apt.pp b/modules/debian-org/manifests/apt.pp
index e013701..2b4dee3 100644 (file)
--- a/modules/debian-org/manifests/apt.pp
+++ b/modules/debian-org/manifests/apt.pp
@@ -33,9 +33,15 @@ class debian-org::apt {
                suite      => "${mungedcodename}/updates",
                components => ['main','contrib','non-free']
        }
+
+       if has_role('experimental_apache') {
+               dbdosuites = [ 'debian-all', $::lsbdistcodename, 'jessie-apache2' ]
+       else
+               dbdosuites = [ 'debian-all', $::lsbdistcodename ]
+       }
        site::aptrepo { 'db.debian.org':
                url        => 'http://db.debian.org/debian-admin',
-               suite      => [ 'debian-all', $::lsbdistcodename ],
+               suite      => $dbdosuites,
                components => 'main',
                key        => 'puppet:///modules/debian-org/db.debian.org.gpg',
        }