BBlack has submitted this change and it was merged.
Change subject: T86663 5.7: switch cp3009 role
......................................................................
T86663 5.7: switch cp3009 role
Change-Id: I72c549f9e1011185ba157807cfb46ce22d7bf27d
---
M hieradata/role/common/cache/text.yaml
M hieradata/role/common/cache/upload.yaml
M manifests/role/cache.pp
M manifests/site.pp
4 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/cache/text.yaml
b/hieradata/role/common/cache/text.yaml
index 605193a..2f2c418 100644
--- a/hieradata/role/common/cache/text.yaml
+++ b/hieradata/role/common/cache/text.yaml
@@ -17,6 +17,7 @@
- 'cp3006.esams.wmnet'
- 'cp3007.esams.wmnet'
- 'cp3008.esams.wmnet'
+ # - 'cp3009.esams.wmnet'
# - 'cp3011.esams.wmnet' # T92306
- 'cp3012.esams.wmnet'
- 'cp3013.esams.wmnet'
diff --git a/hieradata/role/common/cache/upload.yaml
b/hieradata/role/common/cache/upload.yaml
index 21f99a5..8577239 100644
--- a/hieradata/role/common/cache/upload.yaml
+++ b/hieradata/role/common/cache/upload.yaml
@@ -15,7 +15,6 @@
- 'cp1073.eqiad.wmnet'
- 'cp1074.eqiad.wmnet'
hosts_esams:
- # - 'cp3009.esams.wmnet'
- 'cp3010.esams.wmnet'
- 'cp3032.esams.wmnet'
- 'cp3033.esams.wmnet'
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 06f5860..5283b3c 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -76,6 +76,7 @@
'cp3006.esams.wmnet',
'cp3007.esams.wmnet',
'cp3008.esams.wmnet',
+ # 'cp3009.esams.wmnet',
# T92306 'cp3011.esams.wmnet', # needs-jessie-install
'cp3012.esams.wmnet',
'cp3013.esams.wmnet',
@@ -134,7 +135,6 @@
'cp1074.eqiad.wmnet',
],
'esams' => [
- # 'cp3009.esams.wmnet',
'cp3010.esams.wmnet',
'cp3032.esams.wmnet',
'cp3033.esams.wmnet',
diff --git a/manifests/site.pp b/manifests/site.pp
index 2a23504..3c68804 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -400,12 +400,12 @@
role cache::bits
}
-node /^cp30(0[3-8]|1[1234])\.esams\.wmnet$/ {
+node /^cp30(0[3-9]|1[1234])\.esams\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
role cache::text
}
-node /^cp30(09|10)\.esams\.wmnet$/ {
+node /^cp3010\.esams\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
role cache::upload
}
--
To view, visit https://gerrit.wikimedia.org/r/203328
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72c549f9e1011185ba157807cfb46ce22d7bf27d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits