Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: kube2proxy: various puppetization fixes
......................................................................
kube2proxy: various puppetization fixes
Change-Id: I48a4a843e92f3ae011ea006f37a6ce535fcb6474
---
M modules/toollabs/files/kube2dynproxy.py
M modules/toollabs/manifests/kube2proxy.pp
M modules/toollabs/templates/initscripts/kube2proxy.systemd.erb
3 files changed, 13 insertions(+), 9 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/files/kube2dynproxy.py
b/modules/toollabs/files/kube2dynproxy.py
index 3f1c5ec..13831c1 100755
--- a/modules/toollabs/files/kube2dynproxy.py
+++ b/modules/toollabs/files/kube2dynproxy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
import requests
import argparse
import redis
diff --git a/modules/toollabs/manifests/kube2proxy.pp
b/modules/toollabs/manifests/kube2proxy.pp
index c39c028..6f35928 100644
--- a/modules/toollabs/manifests/kube2proxy.pp
+++ b/modules/toollabs/manifests/kube2proxy.pp
@@ -14,18 +14,22 @@
}
group { 'kubeproxy':
+ ensure => present,
system => true,
}
user { 'kubeproxy':
- ensure => present,
- gid => 'kubeproxy',
- shell => '/bin/false',
- home => '/nonexistent',
- system => true,
+ ensure => present,
+ gid => 'kubeproxy',
+ shell => '/bin/false',
+ home => '/nonexistent',
+ system => true,
+ require => Group['kubeproxy']
}
- # Trusty's python-requests package is buggy
+ require_package(['python-requests', 'python-redis', 'python-yaml'])
+
+ # Trusty and jessie's python-requests package is buggy
# and would break watching kubernetes for changes
package { 'requests':
provider => 'pip',
diff --git a/modules/toollabs/templates/initscripts/kube2proxy.systemd.erb
b/modules/toollabs/templates/initscripts/kube2proxy.systemd.erb
index e04c953..31c4a25 100644
--- a/modules/toollabs/templates/initscripts/kube2proxy.systemd.erb
+++ b/modules/toollabs/templates/initscripts/kube2proxy.systemd.erb
@@ -12,6 +12,6 @@
Environment="K2D_KUBE_CA=/var/lib/kubernetes/ssl/certs/ca.pem"
Environment="K2D_TOKEN=<%= @kube_token %>"
Environment="K2D_KUBE_MASTER=<%= @kubemaster %>"
-EnvironmentFile="-/etc/default/kube2proxy"
-ExecStart="/usr/local/sbin/kube2proxy"
+EnvironmentFile=-/etc/default/kube2proxy
+ExecStart=/usr/local/sbin/kube2proxy
--
To view, visit https://gerrit.wikimedia.org/r/242712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48a4a843e92f3ae011ea006f37a6ce535fcb6474
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
