From 13e495c55be6f08f72739620b0dcbff2b9635474 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 25 Oct 2016 10:18:10 +0200 Subject: [PATCH] rename ubc-enc2b9 to ubc-enc2bl09 --- hieradata/clusters/ganeti4.debian.org.yaml | 2 +- hieradata/ubc.yaml | 2 +- manifests/site.pp | 2 +- modules/dsa_lvm/manifests/init.pp | 2 +- modules/ferm/manifests/per-host.pp | 2 +- modules/multipath/manifests/init.pp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hieradata/clusters/ganeti4.debian.org.yaml b/hieradata/clusters/ganeti4.debian.org.yaml index b2dbd597d..93c9234e2 100644 --- a/hieradata/clusters/ganeti4.debian.org.yaml +++ b/hieradata/clusters/ganeti4.debian.org.yaml @@ -2,5 +2,5 @@ nodes: - 'ubc-enc2bl01.debian.org' - 'ubc-enc2bl02.debian.org' - - 'ubc-enc2bl9.debian.org' + - 'ubc-enc2bl09.debian.org' - 'ubc-enc2bl10.debian.org' diff --git a/hieradata/ubc.yaml b/hieradata/ubc.yaml index 0036bf44c..12ba09136 100644 --- a/hieradata/ubc.yaml +++ b/hieradata/ubc.yaml @@ -3,7 +3,7 @@ nameservers: # ubc-enc2bl02 - 209.87.16.2 - 2607:f8f0:614:1::1274:2 - # ubc-enc2bl9 + # ubc-enc2bl09 - 209.87.16.9 - 2607:f8f0:614:1::1274:9 # ubc-enc2bl10 diff --git a/manifests/site.pp b/manifests/site.pp index d06a14006..091e769bd 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -49,7 +49,7 @@ node default { } } - if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl9,ubc-enc2bl10] { + if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10] { include ganeti2 } diff --git a/modules/dsa_lvm/manifests/init.pp b/modules/dsa_lvm/manifests/init.pp index 03caf5179..c40015726 100644 --- a/modules/dsa_lvm/manifests/init.pp +++ b/modules/dsa_lvm/manifests/init.pp @@ -21,7 +21,7 @@ class dsa_lvm { 'clementi','czerny': { $conffile = 'lvm-manda-ganeti.conf' } - 'ubc-enc2bl01','ubc-enc2bl02','ubc-enc2bl9','ubc-enc2bl10': { + 'ubc-enc2bl01','ubc-enc2bl02','ubc-enc2bl09','ubc-enc2bl10': { $conffile = 'lvm-ubc-ganeti2.conf' } default: { diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index f7c7e8656..336abcdf2 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -524,7 +524,7 @@ REJECT reject-with icmp-admin-prohibited rule => 'outerface !tun+ mod mark mark 1 MASQUERADE', } } - ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl9,ubc-enc2bl10: { + ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10: { @ferm::rule { 'dsa-luca-fixme': description => 'Allow ssh access from mnt and vpn networks', rule => '&SERVICE_RANGE(tcp, 22, ( 172.29.40.0/22 172.29.203.0/24 ))', diff --git a/modules/multipath/manifests/init.pp b/modules/multipath/manifests/init.pp index f59bf68cf..ee6f8c4f7 100644 --- a/modules/multipath/manifests/init.pp +++ b/modules/multipath/manifests/init.pp @@ -14,7 +14,7 @@ class multipath { ubc-bl8,ubc-bl4,ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6: { $conffile = 'multipath-ubc-ganeti.conf' } - ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl9,ubc-enc2bl10: { + ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10: { $conffile = 'multipath-ubc-ganeti2.conf' } default: { -- 2.20.1