X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=232aa12e98cfed04966a2969479da62f16e22246;hb=aaa8963b91de9a3cfc1b3d1fbfe06ac822be73a6;hp=5d28d60913169869e8da89eaac487266406d2a8e;hpb=12c607617cee322d46d3f1edbd92f4e5ba2f3d4c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 5d28d6091..232aa12e9 100644
--- 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 {
@@ -208,12 +263,18 @@ class ferm::per-host {
 		default: {}
 	}
 
-	# solr stuff
+	# elasticsearch stuff
 	case $::hostname {
 		stockhausen: {
-			@ferm::rule { 'dsa-solr-jetty':
-				description     => 'Allow jetty access',
-				rule            => '&SERVICE_RANGE(tcp, 8080, ( 82.195.75.100/32 ))'
+			@ferm::rule { 'dsa-elasticsearch-bendel':
+				domain          => '(ip)',
+				description     => 'Allow elasticsearch access from bendel',
+				rule            => '&SERVICE_RANGE(tcp, 9200:9300, ( 82.195.75.100/32 ))'
+			}
+			@ferm::rule { 'dsa-elasticsearch-bendel6':
+				domain          => '(ip6)',
+				description     => 'Allow elasticsearch access from bendel',
+				rule            => '&SERVICE_RANGE(tcp, 9200:9300, ( 2001:41b8:202:deb:216:36ff:fe40:4002/128 ))'
 			}
 		}
 	}
@@ -324,6 +385,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':