BBlack has submitted this change and it was merged.
Change subject: T86663 5.4: switch cp3006 role
......................................................................
T86663 5.4: switch cp3006 role
Change-Id: I57bf1e6bae666f4398de8c1b8d25504857d595da
---
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 15dd37f..9acd4b8 100644
--- a/hieradata/role/common/cache/text.yaml
+++ b/hieradata/role/common/cache/text.yaml
@@ -14,6 +14,7 @@
- 'cp3003.esams.wmnet'
- 'cp3004.esams.wmnet'
- 'cp3005.esams.wmnet'
+ # - 'cp3006.esams.wmnet'
- 'cp3007.esams.wmnet'
- 'cp3008.esams.wmnet'
# - 'cp3011.esams.wmnet' # T92306
diff --git a/hieradata/role/common/cache/upload.yaml
b/hieradata/role/common/cache/upload.yaml
index f22a2fe..e9c623c 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:
- # - 'cp3006.esams.wmnet'
- 'cp3009.esams.wmnet'
- 'cp3010.esams.wmnet'
- 'cp3032.esams.wmnet'
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index ae245fe..fdd118c 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -73,6 +73,7 @@
'cp3003.esams.wmnet',
'cp3004.esams.wmnet',
'cp3005.esams.wmnet',
+ # 'cp3006.esams.wmnet',
'cp3007.esams.wmnet',
'cp3008.esams.wmnet',
# T92306 'cp3011.esams.wmnet', # needs-jessie-install
@@ -133,7 +134,6 @@
'cp1074.eqiad.wmnet',
],
'esams' => [
- # 'cp3006.esams.wmnet',
'cp3009.esams.wmnet',
'cp3010.esams.wmnet',
'cp3032.esams.wmnet',
diff --git a/manifests/site.pp b/manifests/site.pp
index 644057a..2a23504 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -400,12 +400,12 @@
role cache::bits
}
-node /^cp30(0[34578]|1[1234])\.esams\.wmnet$/ {
+node /^cp30(0[3-8]|1[1234])\.esams\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
role cache::text
}
-node /^cp30(0[69]|10)\.esams\.wmnet$/ {
+node /^cp30(09|10)\.esams\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
role cache::upload
}
--
To view, visit https://gerrit.wikimedia.org/r/203325
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I57bf1e6bae666f4398de8c1b8d25504857d595da
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
