Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Revert "puppet/self: use the appropriate override"
......................................................................
Revert "puppet/self: use the appropriate override"
This reverts commit 103148552dedf75ee371683801b95b3056032841.
Change-Id: I9f770ec1166d38dd35a1b7595c3999ad65795af8
---
M modules/base/manifests/puppet.pp
M modules/puppet/manifests/self/config.pp
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index c1b6ea6..9889f69 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -100,3 +100,4 @@
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 3d19444..addbeb2 100644
--- a/modules/puppet/manifests/self/config.pp
+++ b/modules/puppet/manifests/self/config.pp
@@ -74,7 +74,7 @@
}
}
- Base::Puppet::Config['main'] {
+ File <| title == '/etc/puppet/puppet.conf.d/10-main.conf' |> {
ensure => absent,
}
--
To view, visit https://gerrit.wikimedia.org/r/219154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f770ec1166d38dd35a1b7595c3999ad65795af8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
