Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: puppet/self: fix the kafkian puppet syntax
......................................................................


puppet/self: fix the kafkian puppet syntax

On all the labs instances with puppet::self::config, we
had catalogs compilation fail as this file resource was
not defined in the parent class anymore, but in a separate
define. Another way around this would've been to ensure that
specific define to absent.

So as detailed here:

https://docs.puppetlabs.com/puppet/3.8/reference/lang_resources.html

in this case we can only amend the resource using a collector, but
see the caveats there.

I really think this is just an hotfix and we should get away from
inheritance here. I will do so in a later commit.

Change-Id: Icf7613d3e7569f787f5881b358304bd401d3965e
---
M modules/puppet/manifests/self/config.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/puppet/manifests/self/config.pp 
b/modules/puppet/manifests/self/config.pp
index ba420e2..056395c 100644
--- a/modules/puppet/manifests/self/config.pp
+++ b/modules/puppet/manifests/self/config.pp
@@ -75,7 +75,7 @@
         }
     }
 
-    File['/etc/puppet/puppet.conf.d/10-main.conf'] {
+    File <| title == '/etc/puppet/puppet.conf.d/10-main.conf' |> {
         ensure => absent,
     }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf7613d3e7569f787f5881b358304bd401d3965e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to