[MediaWiki-commits] [Gerrit] k8s: Use regular puppet cert path - change (operations/puppet)

2015-12-06 Thread Yuvipanda (Code Review) 
Yuvipanda has submitted this change and it was merged.

Change subject: k8s: Use regular puppet cert path
..


k8s: Use regular puppet cert path

Nodes no longer use the strange role::puppet::self related
stuff, so we can just treat them like 'normal' nodes

Change-Id: I8c06cf8319d99bdd1f5b8cde0925ba0fedb2ee61
---
M modules/k8s/manifests/ssl.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/k8s/manifests/ssl.pp b/modules/k8s/manifests/ssl.pp
index 0f4ff46..6ffa111 100644
--- a/modules/k8s/manifests/ssl.pp
+++ b/modules/k8s/manifests/ssl.pp
@@ -6,7 +6,7 @@
 $provide_private = false,
 $user = 'root',
 $group = 'root',
-$ssldir = '/var/lib/puppet/client/ssl', # FIXME: This is different for 
self hosted puppet vs not. WHY?
+$ssldir = '/var/lib/puppet/ssl',
 $target_basedir = '/var/lib/kubernetes'
 ) {
 $puppet_cert_name = $::fqdn

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8c06cf8319d99bdd1f5b8cde0925ba0fedb2ee61
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
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: Use regular puppet cert path - change (operations/puppet)

2015-12-06 Thread Yuvipanda (Code Review) 
Yuvipanda has uploaded a new change for review.

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

Change subject: k8s: Use regular puppet cert path
..

k8s: Use regular puppet cert path

Nodes no longer use the strange role::puppet::self related
stuff, so we can just treat them like 'normal' nodes

Change-Id: I8c06cf8319d99bdd1f5b8cde0925ba0fedb2ee61
---
M modules/k8s/manifests/ssl.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/257176/1

diff --git a/modules/k8s/manifests/ssl.pp b/modules/k8s/manifests/ssl.pp
index 0f4ff46..6ffa111 100644
--- a/modules/k8s/manifests/ssl.pp
+++ b/modules/k8s/manifests/ssl.pp
@@ -6,7 +6,7 @@
 $provide_private = false,
 $user = 'root',
 $group = 'root',
-$ssldir = '/var/lib/puppet/client/ssl', # FIXME: This is different for 
self hosted puppet vs not. WHY?
+$ssldir = '/var/lib/puppet/ssl',
 $target_basedir = '/var/lib/kubernetes'
 ) {
 $puppet_cert_name = $::fqdn

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c06cf8319d99bdd1f5b8cde0925ba0fedb2ee61
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