retire oyens

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 85bb449..dcbb1e5 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -53,13 +53,9 @@ roles:
     - jerea.debian.org
   keyring:
     - kaufmann.debian.org
-  keystone:
-    - oyens.debian.org
   keystone_rabbitmq:
     - rainier.debian.org
     - rapoport.debian.org
-  memcached:
-    - oyens.debian.org
   lists:
     - bendel.debian.org
   list_search:

diff --git a/manifests/site.pp b/manifests/site.pp
index a02ad66..988dd79 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -89,9 +89,7 @@ node default {
        }
 
        if $::apache2 {
-               if !($::hostname in [oyens]) {
-                       include apache2
-               }
+               include apache2
        }
 
        if $::hostname in [geo1,geo2,geo3] {

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 5a7fb42..e377f53 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -64,7 +64,6 @@ nameinfo:
   muffat.debian.org: George Muffat (June 1st, 1653 - February 23rd, 1704)
   nono.debian.org: Luigi Nono (January 29th, 1924 - May 8th, 1990)
   olin.debian.org: Elisabeth Olin (December 1740 - March 26th, 1828)
-  oyens.debian.org: Tera de Marez Oyens (August 5th, 1932 - August 29th, 1996)
   paradis.debian.org: Maria Theresia Paradis (May 15th, 1759 - February 1st, 1824)
   partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974)
   pejacevic: Dora Pejačević (September 10th, 1885 - March 5th, 1923)

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 9bc01bc..c2954c8 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -11,119 +11,6 @@ class ferm::per-host {
                }
        }
 
-       case $::hostname {
-               bm-bl9: {
-                       @ferm::rule { 'dsa-iscsi':
-                               description     => 'Allow iscsi access',
-                               rule            => '&SERVICE_RANGE(tcp, 3260, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-               }
-               oyens: {
-                       @ferm::rule { 'dsa-spice':
-                               description     => 'Allow spice-console access',
-                               rule            => '&SERVICE(tcp, 6082)'
-                       }
-                       @ferm::rule { 'dsa-memcache':
-                               description     => 'Allow memcache access',
-                               rule            => '&SERVICE_RANGE(tcp, 11211, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-memcache6':
-                               domain          => 'ip6',
-                               description     => 'Allow memcache access',
-                               rule            => '&SERVICE_RANGE(tcp, 11211, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-amqp':
-                               description     => 'Allow rabbitmq access',
-                               rule            => '&SERVICE_RANGE(tcp, 5672, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-amqp6':
-                               domain          => 'ip6',
-                               description     => 'Allow rabbitmq access',
-                               rule            => '&SERVICE_RANGE(tcp, 5672, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-keystone':
-                               description     => 'Allow keystone access',
-                               rule            => '&SERVICE_RANGE(tcp, 5000, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-keystone6':
-                               domain          => 'ip6',
-                               description     => 'Allow keystone access',
-                               rule            => '&SERVICE_RANGE(tcp, 5000, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-keystone-admin':
-                               description     => 'Allow keystone access',
-                               rule            => '&SERVICE_RANGE(tcp, 35357, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-keystone-admin6':
-                               domain          => 'ip6',
-                               description     => 'Allow keystone access',
-                               rule            => '&SERVICE_RANGE(tcp, 35357, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-glance-api':
-                               description     => 'Allow glance access',
-                               rule            => '&SERVICE_RANGE(tcp, 9292, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-glance-api6':
-                               domain          => 'ip6',
-                               description     => 'Allow glance access',
-                               rule            => '&SERVICE_RANGE(tcp, 9292, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-glance-registry':
-                               description     => 'Allow glance access',
-                               rule            => '&SERVICE_RANGE(tcp, 9191, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-glance-registry6':
-                               domain          => 'ip6',
-                               description     => 'Allow glance access',
-                               rule            => '&SERVICE_RANGE(tcp, 9191, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-neutron':
-                               description     => 'Allow glance access',
-                               rule            => '&SERVICE_RANGE(tcp, 9696, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-neutron6':
-                               domain          => 'ip6',
-                               description     => 'Allow glance access',
-                               rule            => '&SERVICE_RANGE(tcp, 9696, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-nova-ec2':
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8773, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-nova-ec26':
-                               domain          => 'ip6',
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8773, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-nova2':
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8774, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-nova26':
-                               domain          => 'ip6',
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8774, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-nova-metadata':
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8775, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-nova-metadata6':
-                               domain          => 'ip6',
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8775, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-cinder':
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8776, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-cinder6':
-                               domain          => 'ip6',
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8776, ( 2001:41c8:1000::/48 ))'
-                       }
-               }
-       }
        case $::hostname {
                czerny,clementi: {
                        @ferm::rule { 'dsa-upsmon':

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 9180089..3a16c75 100644 (file)
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -34,7 +34,6 @@ Host_Alias    BUILDD_MASTER   = wuiet
 Host_Alias     PORTERBOXES     = abel, asachi, barriere, eller, falla, fischer, harris, minkus, partch, plummer, pizzetti, zelenka
 Host_Alias     PIUPARTS_SLAVE_HOSTS    = piu-slave-bm-a
 Host_Alias     MQ_HOSTS        = rainier, rapoport
-Host_Alias     NOVAHOSTS       = oyens
 Host_Alias     JENKINSHOSTS    = jerea
 
 # Cmnd alias specification