X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=fa7f295bdef3a6563ef78d4340b5403947c1d03f;hb=169cb77932b427c80d2731ca5938ecd617a5ad57;hp=22d188fc057f9e7837c901452e7d518077500ac0;hpb=fc978e2bb512bf85d82d054d6086b926a3769bd5;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 22d188fc0..fa7f295bd 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,rietz,sibelius] { ferm::rule { 'dsa-rsync': domain => '(ip ip6)', description => 'Allow rsync access', @@ -25,47 +25,102 @@ 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 2001:41c8:1000::/48 ))' + 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 2001:41c8:1000::/48 ))' + 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 2001:41c8:1000::/48 ))' + 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 2001:41c8:1000::/48 ))' + 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 2001:41c8:1000::/48 ))' + 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 2001:41c8:1000::/48 ))' + 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 2001:41c8:1000::/48 ))' + 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 2001:41c8:1000::/48 ))' + 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 2001:41c8:1000::/48 ))' + 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 2001:41c8:1000::/48 ))' + 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 2001:41c8:1000::/48 ))' + 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 ))' } } } @@ -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 ))' } } } @@ -265,29 +326,29 @@ 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 5.153.231.18/32 ))' + rule => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 5.153.231.28/32 206.12.19.123/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 2001:41c8:1000:21::21:18/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 2001:41c8:1000:21::21:21/128 2001:41c8:1000:21::21:18/128 ))' } - @ferm::rule { 'dsa-postgres-wanna-build': + @ferm::rule { 'dsa-postgres-wannabuild': # wuiet, ullmann, franck description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.18/32 206.12.19.141/32 138.16.160.12/32 ))' } - @ferm::rule { 'dsa-postgres-wanna-build6': + @ferm::rule { 'dsa-postgres-wannabuild6': domain => 'ip6', description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5436, ( 2001:41c8:1000:21::21:18/128 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 ))' } - @ferm::rule { 'dsa-postgres-wanna-build-ports': + @ferm::rule { 'dsa-postgres-wannabuild-ports': # portman description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.29/32 ))' } - @ferm::rule { 'dsa-postgres-wanna-build-ports6': + @ferm::rule { 'dsa-postgres-wannabuild-ports6': domain => 'ip6', description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5436, ( 2001:41c8:1000:21::21:29/128 ))'