Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/246295
Change subject: k8s: Move the ferm fules into the role
......................................................................
k8s: Move the ferm fules into the role
Change-Id: Iec19b6f47d24e0363c83a69c3f78b9326ce5990b
---
M manifests/role/tools.pp
M modules/k8s/manifests/flannel.pp
2 files changed, 10 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/246295/1
diff --git a/manifests/role/tools.pp b/manifests/role/tools.pp
index 1f2be51..e0610ef 100644
--- a/manifests/role/tools.pp
+++ b/manifests/role/tools.pp
@@ -76,6 +76,11 @@
$master_host = hiera('k8s_master')
$etcd_url = join(prefix(suffix(hiera('etcd_hosts', [$master_host]),
':2379'), 'https://'), ',')
+ ferm::service { 'flannel-vxlan':
+ proto => udp,
+ port => 8472,
+ }
+
class { '::k8s::flannel':
etcd_endpoints => $etcd_url,
}
@@ -95,6 +100,11 @@
$master_host = hiera('k8s_master')
$etcd_url = join(prefix(suffix(hiera('etcd_hosts', [$master_host]),
':2379'), 'https://'), ',')
+ ferm::service { 'flannel-vxlan':
+ proto => udp,
+ port => 8472,
+ }
+
class { '::k8s::flannel':
etcd_endpoints => $etcd_url,
}
diff --git a/modules/k8s/manifests/flannel.pp b/modules/k8s/manifests/flannel.pp
index c4a3657..1932940 100644
--- a/modules/k8s/manifests/flannel.pp
+++ b/modules/k8s/manifests/flannel.pp
@@ -6,9 +6,4 @@
base::service_unit { 'flannel':
systemd => true,
}
-
- ferm::service { 'flannel-vxlan':
- proto => udp,
- port => 8472,
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/246295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec19b6f47d24e0363c83a69c3f78b9326ce5990b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
