[MediaWiki-commits] [Gerrit] k8s: Ensure /etc/kubernetes is present wherever required - change (operations/puppet)

2016-05-30 Thread Yuvipanda (Code Review) 
Yuvipanda has submitted this change and it was merged.

Change subject: k8s: Ensure /etc/kubernetes is present wherever required
..


k8s: Ensure /etc/kubernetes is present wherever required

Change-Id: I932664528562393f0e03e5ad4997ec7007a18d94
---
M modules/k8s/manifests/infrastructure_config.pp
M modules/k8s/manifests/kubelet.pp
2 files changed, 8 insertions(+), 10 deletions(-)

Approvals:
  Yuvipanda: Verified; Looks good to me, approved



diff --git a/modules/k8s/manifests/infrastructure_config.pp 
b/modules/k8s/manifests/infrastructure_config.pp
index 3bab4c1..b628c89 100644
--- a/modules/k8s/manifests/infrastructure_config.pp
+++ b/modules/k8s/manifests/infrastructure_config.pp
@@ -1,4 +1,11 @@
 class k8s::infrastructure_config {
+file { '/etc/kubernetes':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode   => '0755',
+}
+
 $users = hiera('k8s_users')
 # Ugly HACK!
 $client_token = inline_template("<%= @users.select { |u| u['name'] == 
'client-infrastructure' }[0]['token'] %>")
@@ -8,5 +15,6 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0400',
+require => File['/etc/kubernetes'],
 }
 }
diff --git a/modules/k8s/manifests/kubelet.pp b/modules/k8s/manifests/kubelet.pp
index d1e7834..ccc6b67 100644
--- a/modules/k8s/manifests/kubelet.pp
+++ b/modules/k8s/manifests/kubelet.pp
@@ -6,16 +6,6 @@
 include ::k8s::infrastructure_config
 
 file { [
-'/etc/kubernetes/',
-'/etc/kubernetes/manifests',
-]:
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0755',
-}
-
-file { [
 '/var/run/kubernetes',
 '/var/lib/kubelet',
 ] :

-- 
To view, visit https://gerrit.wikimedia.org/r/291617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I932664528562393f0e03e5ad4997ec7007a18d94
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] k8s: Ensure /etc/kubernetes is present wherever required - change (operations/puppet)

2016-05-29 Thread Yuvipanda (Code Review) 
Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/291617

Change subject: k8s: Ensure /etc/kubernetes is present wherever required
..

k8s: Ensure /etc/kubernetes is present wherever required

Change-Id: I932664528562393f0e03e5ad4997ec7007a18d94
---
M modules/k8s/manifests/infrastructure_config.pp
M modules/k8s/manifests/kubelet.pp
2 files changed, 8 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/291617/1

diff --git a/modules/k8s/manifests/infrastructure_config.pp 
b/modules/k8s/manifests/infrastructure_config.pp
index 3bab4c1..b628c89 100644
--- a/modules/k8s/manifests/infrastructure_config.pp
+++ b/modules/k8s/manifests/infrastructure_config.pp
@@ -1,4 +1,11 @@
 class k8s::infrastructure_config {
+file { '/etc/kubernetes':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode   => '0755',
+}
+
 $users = hiera('k8s_users')
 # Ugly HACK!
 $client_token = inline_template("<%= @users.select { |u| u['name'] == 
'client-infrastructure' }[0]['token'] %>")
@@ -8,5 +15,6 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0400',
+require => File['/etc/kubernetes'],
 }
 }
diff --git a/modules/k8s/manifests/kubelet.pp b/modules/k8s/manifests/kubelet.pp
index d1e7834..ccc6b67 100644
--- a/modules/k8s/manifests/kubelet.pp
+++ b/modules/k8s/manifests/kubelet.pp
@@ -6,16 +6,6 @@
 include ::k8s::infrastructure_config
 
 file { [
-'/etc/kubernetes/',
-'/etc/kubernetes/manifests',
-]:
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0755',
-}
-
-file { [
 '/var/run/kubernetes',
 '/var/lib/kubelet',
 ] :

-- 
To view, visit https://gerrit.wikimedia.org/r/291617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I932664528562393f0e03e5ad4997ec7007a18d94
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits