Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212532
Change subject: puppet/self: use the appropriate override
......................................................................
puppet/self: use the appropriate override
This commit is a fixup for Icf7613d3e , where to make puppet happy I
used a syntax that comes, according to puppetlabs, with a ton of
caveats.
Change-Id: Iffb652b32a8f24683fc7491b6439bb74672ec24c
---
M modules/base/manifests/puppet.pp
M modules/puppet/manifests/self/config.pp
2 files changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/212532/1
diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index 9889f69..c1b6ea6 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -100,4 +100,3 @@
source => 'puppet:///modules/base/puppet/97-last-puppet-run',
}
}
-
diff --git a/modules/puppet/manifests/self/config.pp
b/modules/puppet/manifests/self/config.pp
index 056395c..fa2c024 100644
--- a/modules/puppet/manifests/self/config.pp
+++ b/modules/puppet/manifests/self/config.pp
@@ -75,7 +75,7 @@
}
}
- File <| title == '/etc/puppet/puppet.conf.d/10-main.conf' |> {
+ Base::Puppet::Config['main'] {
ensure => absent,
}
--
To view, visit https://gerrit.wikimedia.org/r/212532
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffb652b32a8f24683fc7491b6439bb74672ec24c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
