From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 13 Dec 2014 10:14:47 +0000 (+0100)
Subject: add IPv6 range
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=fc978e2bb512bf85d82d054d6086b926a3769bd5;p=mirror%2Fdsa-puppet.git

add IPv6 range

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 21ff820c4..22d188fc0 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -25,47 +25,47 @@ class ferm::per-host {
 			}
 			@ferm::rule { 'dsa-memcache':
 				description     => 'Allow memcache access',
-				rule            => '&SERVICE_RANGE(tcp, 11211, ( 5.153.231.240/27 172.29.123.0/24 ))'
+				rule            => '&SERVICE_RANGE(tcp, 11211, ( 5.153.231.240/27 172.29.123.0/24 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 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5672, ( 5.153.231.240/27 172.29.123.0/24 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 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5000, ( 5.153.231.240/27 172.29.123.0/24 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 ))'
+				rule            => '&SERVICE_RANGE(tcp, 35357, ( 5.153.231.240/27 172.29.123.0/24 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 ))'
+				rule            => '&SERVICE_RANGE(tcp, 9292, ( 5.153.231.240/27 172.29.123.0/24 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 ))'
+				rule            => '&SERVICE_RANGE(tcp, 9191, ( 5.153.231.240/27 172.29.123.0/24 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 ))'
+				rule            => '&SERVICE_RANGE(tcp, 9696, ( 5.153.231.240/27 172.29.123.0/24 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 ))'
+				rule            => '&SERVICE_RANGE(tcp, 8773, ( 5.153.231.240/27 172.29.123.0/24 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 ))'
+				rule            => '&SERVICE_RANGE(tcp, 8774, ( 5.153.231.240/27 172.29.123.0/24 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 ))'
+				rule            => '&SERVICE_RANGE(tcp, 8775, ( 5.153.231.240/27 172.29.123.0/24 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 ))'
+				rule            => '&SERVICE_RANGE(tcp, 8776, ( 5.153.231.240/27 172.29.123.0/24 2001:41c8:1000::/48 ))'
 			}
 		}
 	}