add iscsi rules for bm-bl9

[mirror/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 0456c8a..273e6a5 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,22 +27,38 @@ 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-glance':
+                       @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-registry':
+                               description     => 'Allow glance access',
+                               rule            => '&SERVICE_RANGE(tcp, 9191, ( 5.153.231.240/27 172.29.123.0/24 ))'
+                       }
                        @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-nova':
+                       @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-nova2':
                                description     => 'Allow nova access',
                                rule            => '&SERVICE_RANGE(tcp, 8774, ( 5.153.231.240/27 172.29.123.0/24 ))'
                        }
+                       @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-cinder':
+                               description     => 'Allow nova access',
+                               rule            => '&SERVICE_RANGE(tcp, 8776, ( 5.153.231.240/27 172.29.123.0/24 ))'
+                       }
                }
        }
        case $::hostname {
@@ -265,12 +287,12 @@ class ferm::per-host {
                bmdb1: {
                        @ferm::rule { 'dsa-postgres-main':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.14/32 5.153.231.23/32 5.153.231.25/32 206.12.19.141/32 5.153.231.26/32 5.153.231.18/32 5.153.231.28/32 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.14/32 5.153.231.23/32 5.153.231.25/32 206.12.19.141/32 5.153.231.26/32 5.153.231.18/32 5.153.231.28/32 5.153.231.249/32 ))'
                        }
                        @ferm::rule { 'dsa-postgres-main6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:23/128 2001:41c8:1000:21::21:25/128 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 2001:41c8:1000:21::21:26/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:28/128))'
+                               rule            => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:23/128 2001:41c8:1000:21::21:25/128 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 2001:41c8:1000:21::21:26/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:28/128 2001:41c8:1000:20::20:249/128))'
                        }
                        @ferm::rule { 'dsa-postgres-dak':
                                description     => 'Allow postgress access',