Decommission senfl.debian.org

[dsa-puppet.git] / modules / ferm / manifests / per-host.pp

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index e7016c8960dcc4f59317aad6e1ff4204c8c29981..643ec2ff2b8a4b3b4b17b05a2ea52ac5a22a1b5e 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,7 +3,7 @@ class ferm::per-host {
                include ferm::zivit
        }
 
-       if $::hostname in [glinka,klecker,ravel,rietz,senfl,sibelius] {
+       if $::hostname in [glinka,klecker,ravel,rietz,sibelius] {
                ferm::rule { 'dsa-rsync':
                        domain      => '(ip ip6)',
                        description => 'Allow rsync access',
@@ -27,46 +27,101 @@ class ferm::per-host {
                                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 {
@@ -141,24 +196,6 @@ class ferm::per-host {
                default: {}
        }
 
-       if $::hostname in [rautavaara] {
-               @ferm::rule { 'dsa-from-mgmt':
-                       description     => 'Traffic routed from mgmt net vlan/bridge',
-                       chain           => 'INPUT',
-                       rule            => 'interface eth1 ACCEPT'
-               }
-               @ferm::rule { 'dsa-mgmt-mark':
-                       table           => 'mangle',
-                       chain           => 'PREROUTING',
-                       rule            => 'interface eth1 MARK set-mark 1',
-               }
-               @ferm::rule { 'dsa-mgmt-nat':
-                       table           => 'nat',
-                       chain           => 'POSTROUTING',
-                       rule            => 'outerface eth1 mod mark mark 1 MASQUERADE',
-               }
-       }
-
        # redirect snapshot into varnish
        case $::hostname {
                sibelius: {
@@ -342,6 +379,16 @@ class ferm::per-host {
                                description     => 'Allow postgress access',
                                rule            => '&SERVICE_RANGE(tcp, (5439), ( 2001:41c8:1000:21::21:17/128 ))'
                        }
+
+                       @ferm::rule { 'dsa-postgres-debsources':
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, (5440), ( 5.153.231.38/32 ))'
+                       }
+                       @ferm::rule { 'dsa-postgres-debsources6':
+                               domain          => 'ip6',
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, (5440), ( 2001:41c8:1000:21::21:38/128 ))'
+                       }
                }
                danzi: {
                        @ferm::rule { 'dsa-postgres-danzi':