X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=038b670c98b06af55f2c6ee45a7ada02d4dfce22;hb=54444a09e6b53214e11e1ed18f71bbf90ba57f65;hp=21ff820c48787c330e578031677c064aec5145cb;hpb=a8c715146285704c42a191b9cdd3f96b54bdd498;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 21ff820c4..038b670c9 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', @@ -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 ))' } } } @@ -223,13 +284,13 @@ class ferm::per-host { ullmann: { @ferm::rule { 'dsa-postgres-udd': description => 'Allow postgress access', - # quantz, moszumanska, master, couper, coccia, franck - rule => '&SERVICE_RANGE(tcp, 5452, ( 5.153.231.28/32 5.153.231.21/32 82.195.75.110/32 5.153.231.14/32 5.153.231.11/32 138.16.160.12/32 ))' + # quantz, moszumanska, master, coccia, franck + rule => '&SERVICE_RANGE(tcp, 5452, ( 5.153.231.28/32 5.153.231.21/32 82.195.75.110/32 5.153.231.11/32 138.16.160.12/32 ))' } @ferm::rule { 'dsa-postgres-udd6': domain => '(ip6)', description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5452, ( 2001:41c8:1000:21::21:28/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:11/32 2001:41c8:1000:21::21:21/128 ))' + rule => '&SERVICE_RANGE(tcp, 5452, ( 2001:41c8:1000:21::21:28/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:11/32 2001:41c8:1000:21::21:21/128 ))' } } franck: { @@ -256,38 +317,38 @@ 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 5.153.231.249/32 5.153.231.29/32))' + rule => '&SERVICE_RANGE(tcp, 5435, ( 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 5.153.231.29/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 2001:41c8:1000:20::20:249/128 2001:41c8:1000:21::21:29/128))' + rule => '&SERVICE_RANGE(tcp, 5435, ( 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 2001:41c8:1000:21::21:29/128))' } @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 ))' @@ -370,7 +431,7 @@ class ferm::per-host { rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))' } } - chopin: { + seger: { @ferm::rule { 'dsa-postgres-backup': description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))' @@ -416,7 +477,7 @@ class ferm::per-host { } # vpn fu case $::hostname { - draghi,eysler: { + draghi: { @ferm::rule { 'dsa-vpn': description => 'Allow openvpn access', rule => '&SERVICE(udp, 17257)' @@ -451,7 +512,7 @@ REJECT reject-with icmp-admin-prohibited rule => '&SERVICE_RANGE(udp, 69, ( 172.28.17.0/24 ))' } } - jenkins: { + jenko: { @ferm::rule { 'dsa-tftp': description => 'Allow tftp access', rule => '&SERVICE_RANGE(udp, 69, ( 192.168.2.0/24 206.12.19.0/24 ))'