Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/267809
Change subject: tools: Minor cleanup
......................................................................
tools: Minor cleanup
- Remove comment that is no longer true
- Use k8s::master_host rather than k8s_master
Change-Id: Iacef666d0d49a4f4969b1c9eb66c12dacc3e4cac
---
M manifests/role/tools.pp
1 file changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/267809/1
diff --git a/manifests/role/tools.pp b/manifests/role/tools.pp
index 8eccc8c..0daf748 100644
--- a/manifests/role/tools.pp
+++ b/manifests/role/tools.pp
@@ -57,15 +57,12 @@
}
class role::toollabs::k8s::master {
- # This requires that etcd is on the same host
- # And is not HA. Will re-evaluate when it is HA
-
include base::firewall
include toollabs::infrastructure
include ::etcd
- $master_host = hiera('k8s_master', $::fqdn)
+ $master_host = hiera('k8s::master_host', $::fqdn)
$etcd_url = join(prefix(suffix(hiera('k8s::etcd_hosts'), ':2379'),
'https://'), ',')
class { 'k8s::apiserver':
@@ -94,7 +91,7 @@
# ferm and kube-proxy will conflict
include toollabs::infrastructure
- $master_host = hiera('k8s_master')
+ $master_host = hiera('k8s::master_hosts')
$etcd_url = join(prefix(suffix(hiera('flannel::etcd_hosts',
[$master_host]), ':2379'), 'https://'), ',')
ferm::service { 'flannel-vxlan':
--
To view, visit https://gerrit.wikimedia.org/r/267809
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacef666d0d49a4f4969b1c9eb66c12dacc3e4cac
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
