X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=c2954c87a8336ce65ef1029c35bed4bcb5ca2c9b;hb=74b848186ff77f1247370d033d9e7e8806193317;hp=9bc01bc14adcaf7aa173d8ea2cbdc4ce74f0ecab;hpb=0eac7df37c0c66b166b66a76f200bd71c7433be1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 9bc01bc14..c2954c87a 100644
--- 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':