Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365605 )
Change subject: puppetmaster: Don't use storeconfig_thin
......................................................................
puppetmaster: Don't use storeconfig_thin
The storeconfig='none' option isn't used in production, only on Labs.
And we definitely don't want exported resources on Labs because that
violates tenant isolation.
Change-Id: I7accfce767218515f3f7af75d3894dbdcae20d06
---
M modules/profile/manifests/puppetmaster/common.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/profile/manifests/puppetmaster/common.pp
b/modules/profile/manifests/puppetmaster/common.pp
index 72cef44..d18ffe6 100644
--- a/modules/profile/manifests/puppetmaster/common.pp
+++ b/modules/profile/manifests/puppetmaster/common.pp
@@ -53,6 +53,6 @@
} elsif $storeconfigs == 'activerecord' {
$config = merge($base_config, $activerecord_config,
$active_record_db, $env_config)
} else {
- $config = merge($base_config, $env_config, {'thin_storeconfigs' =>
true} )
+ $config = merge($base_config, $env_config)
}
}
--
To view, visit https://gerrit.wikimedia.org/r/365605
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7accfce767218515f3f7af75d3894dbdcae20d06
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
