[MediaWiki-commits] [Gerrit] operations/puppet[production]: k8s: Attempt to fix puppet circular dependency cycle

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338471 )

Change subject: k8s: Attempt to fix puppet circular dependency cycle
......................................................................

k8s: Attempt to fix puppet circular dependency cycle

Change-Id: Ia21a182d0518f2dc3578841505ad0318f2f297d3
---
M modules/k8s/manifests/apiserver.pp
M modules/role/manifests/toollabs/k8s/master.pp
2 files changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/338471/1

diff --git a/modules/k8s/manifests/apiserver.pp 
b/modules/k8s/manifests/apiserver.pp
index 24a2321..5bf8970 100644
--- a/modules/k8s/manifests/apiserver.pp
+++ b/modules/k8s/manifests/apiserver.pp
@@ -24,14 +24,11 @@
 ) {
     include ::k8s::users
 
-    if !defined(File['/etc/kubernetes']) {
-        # because base::expose_puppet_certs also does this
-        file { '/etc/kubernetes':
-            ensure => directory,
-            owner  => 'kubernetes',
-            group  => 'kubernetes',
-            mode   => '0700',
-        }
+    file { '/etc/kubernetes':
+        ensure => directory,
+        owner  => 'kubernetes',
+        group  => 'kubernetes',
+        mode   => '0700',
     }
 
     if $use_package {
diff --git a/modules/role/manifests/toollabs/k8s/master.pp 
b/modules/role/manifests/toollabs/k8s/master.pp
index a55d077..109cec7 100644
--- a/modules/role/manifests/toollabs/k8s/master.pp
+++ b/modules/role/manifests/toollabs/k8s/master.pp
@@ -9,12 +9,15 @@
     $etcd_url = join(prefix(suffix(hiera('k8s::etcd_hosts'), ':2379'), 
'https://'), ',')
 
     if $use_puppet_certs {
+        # Do not explicitly set a before here, since it
+        # seems to make puppet think there's a circular
+        # dependency cycle?!
         base::expose_puppet_certs { '/etc/kubernetes':
             provide_private => true,
             user            => 'kubernetes',
             group           => 'kubernetes',
-            before          => Class['::k8s::apiserver']
         }
+
         $ssl_cert_path = '/etc/kubernetes/ssl/cert.pem'
         $ssl_key_path = '/etc/kubernetes/ssl/server.key'
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia21a182d0518f2dc3578841505ad0318f2f297d3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>

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