Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376250 )
Change subject: Remove restbase salt grains previously used by debdeploy
......................................................................
Remove restbase salt grains previously used by debdeploy
Change-Id: I3f066fc4ac475f895a1b675465dbe794acb702a1
---
M hieradata/hosts/restbase1008.yaml
M hieradata/role/codfw/restbase/production.yaml
M hieradata/role/codfw/restbase/test_cluster.yaml
M hieradata/role/common/restbase/test_cluster.yaml
M hieradata/role/eqiad/restbase/production.yaml
M hieradata/role/eqiad/restbase/test_cluster.yaml
6 files changed, 0 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/376250/1
diff --git a/hieradata/hosts/restbase1008.yaml
b/hieradata/hosts/restbase1008.yaml
index fddb226..f1860df 100644
--- a/hieradata/hosts/restbase1008.yaml
+++ b/hieradata/hosts/restbase1008.yaml
@@ -1,5 +1,2 @@
profile::cassandra::rack: 'b'
cassandra::jbod_devices: ['sda4', 'sdb4', 'sdc4', 'sdd4', 'sde4']
-debdeploy::grains:
- debdeploy-restbase:
- value: canary
diff --git a/hieradata/role/codfw/restbase/production.yaml
b/hieradata/role/codfw/restbase/production.yaml
index 32fc3f0..0ce4ace 100644
--- a/hieradata/role/codfw/restbase/production.yaml
+++ b/hieradata/role/codfw/restbase/production.yaml
@@ -16,7 +16,3 @@
lvs::realserver::realserver_ips:
- '10.2.1.17' # restbase.svc.codfw.wmnet
-
-debdeploy::grains:
- debdeploy-restbase-codfw:
- value: standard
diff --git a/hieradata/role/codfw/restbase/test_cluster.yaml
b/hieradata/role/codfw/restbase/test_cluster.yaml
index b03e8ff..9efc62f 100644
--- a/hieradata/role/codfw/restbase/test_cluster.yaml
+++ b/hieradata/role/codfw/restbase/test_cluster.yaml
@@ -4,9 +4,3 @@
- restbase-test2003.codfw.wmnet
# We don't want paging
do_paging: false
-debdeploy::grains:
- debdeploy-restbase:
- value: standard
-debdeploy::grains:
- debdeploy-restbase-codfw:
- value: standard
diff --git a/hieradata/role/common/restbase/test_cluster.yaml
b/hieradata/role/common/restbase/test_cluster.yaml
index 3a233be..82a700d 100644
--- a/hieradata/role/common/restbase/test_cluster.yaml
+++ b/hieradata/role/common/restbase/test_cluster.yaml
@@ -1,7 +1,4 @@
cluster: restbase_test
-debdeploy::grains:
- debdeploy-restbase:
- value: canary
profile::restbase::cassandra_local_dc: "%{::site}"
profile::restbase::logging_label: restbase-test
profile::restbase::cassandra_datacenters:
diff --git a/hieradata/role/eqiad/restbase/production.yaml
b/hieradata/role/eqiad/restbase/production.yaml
index 8a859ed..b3b662e 100644
--- a/hieradata/role/eqiad/restbase/production.yaml
+++ b/hieradata/role/eqiad/restbase/production.yaml
@@ -15,7 +15,3 @@
- restbase1013.eqiad.wmnet
- restbase1014.eqiad.wmnet
- restbase1015.eqiad.wmnet
-
-debdeploy::grains:
- debdeploy-restbase-eqiad:
- value: standard
diff --git a/hieradata/role/eqiad/restbase/test_cluster.yaml
b/hieradata/role/eqiad/restbase/test_cluster.yaml
index 2b66576..306a93a 100644
--- a/hieradata/role/eqiad/restbase/test_cluster.yaml
+++ b/hieradata/role/eqiad/restbase/test_cluster.yaml
@@ -2,6 +2,3 @@
- cerium.eqiad.wmnet
- praseodymium.eqiad.wmnet
- xenon.eqiad.wmnet
-debdeploy::grains:
- debdeploy-restbase-eqiad:
- value: standard
--
To view, visit https://gerrit.wikimedia.org/r/376250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f066fc4ac475f895a1b675465dbe794acb702a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
