alwyn.d.o: decommision

[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 f87b97cbcbae61deb828542521209913738e7985..388048ea31478567ba5479489a9ed227049f50ea 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -12,6 +12,12 @@ 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-amqp':
                                description     => 'Allow rabbitmq access',
@@ -21,15 +27,15 @@ class ferm::per-host {
                                description     => 'Allow keystone access',
                                rule            => '&SERVICE_RANGE(tcp, 5000, ( 5.153.231.240/27 172.29.123.0/24 ))'
                        }
-                       @ferm::rule { 'dsa-keystone2':
+                       @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-glance1':
+                       @ferm::rule { 'dsa-glance-api':
                                description     => 'Allow glance access',
-                               rule            => '&SERVICE_RANGE(tcp, 9191, ( 5.153.231.240/27 172.29.123.0/24 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 9292, ( 5.153.231.240/27 172.29.123.0/24 ))'
                        }
-                       @ferm::rule { 'dsa-glance2':
+                       @ferm::rule { 'dsa-glance-registry':
                                description     => 'Allow glance access',
                                rule            => '&SERVICE_RANGE(tcp, 9191, ( 5.153.231.240/27 172.29.123.0/24 ))'
                        }
@@ -37,7 +43,7 @@ class ferm::per-host {
                                description     => 'Allow glance access',
                                rule            => '&SERVICE_RANGE(tcp, 9696, ( 5.153.231.240/27 172.29.123.0/24 ))'
                        }
-                       @ferm::rule { 'dsa-nova1':
+                       @ferm::rule { 'dsa-nova-ec2':
                                description     => 'Allow nova access',
                                rule            => '&SERVICE_RANGE(tcp, 8773, ( 5.153.231.240/27 172.29.123.0/24 ))'
                        }
@@ -45,7 +51,7 @@ class ferm::per-host {
                                description     => 'Allow nova access',
                                rule            => '&SERVICE_RANGE(tcp, 8774, ( 5.153.231.240/27 172.29.123.0/24 ))'
                        }
-                       @ferm::rule { 'dsa-nova3':
+                       @ferm::rule { 'dsa-nova-metadata':
                                description     => 'Allow nova access',
                                rule            => '&SERVICE_RANGE(tcp, 8775, ( 5.153.231.240/27 172.29.123.0/24 ))'
                        }
@@ -76,7 +82,7 @@ class ferm::per-host {
                                rule        => 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP',
                        }
                }
-               abel,alwyn,rietz,jenkins: {
+               abel,rietz,jenkins: {
                        @ferm::rule { 'dsa-tftp':
                                description     => 'Allow tftp access',
                                rule            => '&SERVICE(udp, 69)'
@@ -124,21 +130,6 @@ class ferm::per-host {
                                rule            => '&SERVICE(tcp, 636)'
                        }
                }
-               cilea: {
-                       ferm::module { 'nf_conntrack_sip': }
-                       ferm::module { 'nf_conntrack_h323': }
-
-                       @ferm::rule { 'dsa-sip':
-                               domain          => '(ip ip6)',
-                               description     => 'Allow sip access',
-                               rule            => '&TCP_UDP_SERVICE(5060)'
-                       }
-                       @ferm::rule { 'dsa-sipx':
-                               domain          => '(ip ip6)',
-                               description     => 'Allow sipx access',
-                               rule            => '&TCP_UDP_SERVICE(5080)'
-                       }
-               }
                sonntag: {
                        @ferm::rule { 'dsa-bugs-search':
                                description  => 'port 1978 for bugs-search from bug web frontends',
@@ -290,12 +281,12 @@ class ferm::per-host {
                        }
                        @ferm::rule { 'dsa-postgres-dak':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 5.153.231.28/32 206.12.19.123/32 206.12.19.134/32 5.153.231.21/32 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 5.153.231.28/32 206.12.19.123/32 206.12.19.134/32 5.153.231.21/32 5.153.231.18/32 ))'
                        }
                        @ferm::rule { 'dsa-postgres-dak6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 2001:41c8:1000:21::21:11/128 2001:41c8:1000:21::21:28/128 2607:f8f0:610:4000:216:36ff:fe40:3861/128 2607:f8f0:610:4000:6564:a62:ce0c:1386/128 2001:41c8:1000:21::21:21/128 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 2001:41c8:1000:21::21:11/128 2001:41c8:1000:21::21:28/128 2607:f8f0:610:4000:216:36ff:fe40:3861/128 2607:f8f0:610:4000:6564:a62:ce0c:1386/128 2001:41c8:1000:21::21:21/128 2001:41c8:1000:21::21:18/128 ))'
                        }
                        @ferm::rule { 'dsa-postgres-wanna-build':
                                # wuiet, ullmann, franck