Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/219155
Change subject: Revert "puppet/self: use the appropriate override"
......................................................................
Revert "puppet/self: use the appropriate override"
Causes puppet error on labs puppetmaster self:
Error: Could not retrieve catalog from remote server:
Error 400 on SERVER: Only subclasses can override parameters
at 79:modules/puppet/manifests/self/config.pp
This reverts commit 103148552dedf75ee371683801b95b3056032841.
Bug: T102947
Change-Id: I7d842def6ebd3d625f1260fa0a5ba881f0365805
---
M modules/base/manifests/puppet.pp
M modules/puppet/manifests/self/config.pp
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/219155/1
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/219155
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d842def6ebd3d625f1260fa0a5ba881f0365805
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
