Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394439 )
Change subject: kubernetes: remove ganglia
......................................................................
kubernetes: remove ganglia
Bug: T177225
Change-Id: I27d029c36415ca935ae5e191487d53a8e16208e8
---
M hieradata/role/common/etcd/kubernetes.yaml
M hieradata/role/common/kubernetes/master.yaml
M hieradata/role/common/kubernetes/staging/etcd.yaml
M hieradata/role/common/kubernetes/staging/master.yaml
M hieradata/role/common/kubernetes/staging/worker.yaml
M hieradata/role/common/kubernetes/worker.yaml
6 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/394439/1
diff --git a/hieradata/role/common/etcd/kubernetes.yaml
b/hieradata/role/common/etcd/kubernetes.yaml
index 5a24d81..dbeacb4 100644
--- a/hieradata/role/common/etcd/kubernetes.yaml
+++ b/hieradata/role/common/etcd/kubernetes.yaml
@@ -1,4 +1,5 @@
cluster: kubernetes
+standard::has_ganglia: false
profile::etcd::cluster_name: "k8s.%{::site}"
profile::etcd::discovery: "dns:k8s.%{::site}.wmnet"
profile::etcd::use_client_certs: false
diff --git a/hieradata/role/common/kubernetes/master.yaml
b/hieradata/role/common/kubernetes/master.yaml
index e0addcd..481fe71 100644
--- a/hieradata/role/common/kubernetes/master.yaml
+++ b/hieradata/role/common/kubernetes/master.yaml
@@ -1,4 +1,5 @@
cluster: kubernetes
+standard::has_ganglia: false
profile::kubernetes::master::accessible_to: all
profile::kubernetes::master::apiserver_count: 2
profile::kubernetes::master::admission_controllers:
diff --git a/hieradata/role/common/kubernetes/staging/etcd.yaml
b/hieradata/role/common/kubernetes/staging/etcd.yaml
index 167947c..7301cb5 100644
--- a/hieradata/role/common/kubernetes/staging/etcd.yaml
+++ b/hieradata/role/common/kubernetes/staging/etcd.yaml
@@ -1,4 +1,5 @@
cluster: kubernetes
+standard::has_ganglia: false
profile::etcd::cluster_name: "k8s-staging.%{::site}"
profile::etcd::discovery: "dns:k8s-staging.%{::site}.wmnet"
profile::etcd::use_client_certs: false
diff --git a/hieradata/role/common/kubernetes/staging/master.yaml
b/hieradata/role/common/kubernetes/staging/master.yaml
index 1b61b48..3986bb0 100644
--- a/hieradata/role/common/kubernetes/staging/master.yaml
+++ b/hieradata/role/common/kubernetes/staging/master.yaml
@@ -1,4 +1,5 @@
cluster: kubernetes
+standard::has_ganglia: false
profile::kubernetes::master::accessible_to:
- kubestage1001.eqiad.wmnet
- kubestage1002.eqiad.wmnet
diff --git a/hieradata/role/common/kubernetes/staging/worker.yaml
b/hieradata/role/common/kubernetes/staging/worker.yaml
index c2af37a..c336297 100644
--- a/hieradata/role/common/kubernetes/staging/worker.yaml
+++ b/hieradata/role/common/kubernetes/staging/worker.yaml
@@ -7,6 +7,7 @@
- cr1-eqiad.wikimedia.org
- cr2-eqiad.wikimedia.org
cluster: kubernetes
+standard::has_ganglia: false
profile::docker::storage::physical_volumes: "/dev/md2"
profile::docker::storage::vg_to_remove: ''
profile::docker::engine::version: "1.12.6-0~debian-jessie"
diff --git a/hieradata/role/common/kubernetes/worker.yaml
b/hieradata/role/common/kubernetes/worker.yaml
index 40c447f..54bc6a8 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -1,4 +1,5 @@
cluster: kubernetes
+standard::has_ganglia: false
profile::docker::storage::physical_volumes: "/dev/md2"
profile::docker::storage::vg_to_remove: ''
profile::docker::engine::version: "1.12.6-0~debian-jessie"
--
To view, visit https://gerrit.wikimedia.org/r/394439
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27d029c36415ca935ae5e191487d53a8e16208e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
