Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/249093
Change subject: deployment::mediawiki: rename wikitech::wiki::password class
......................................................................
deployment::mediawiki: rename wikitech::wiki::password class
And remove the module in the process as it's useless
Change-Id: If4a513f29dc84cf869de93bf775e3fc5de2784e2
---
R modules/deployment/manifests/wikitech.pp
R modules/deployment/templates/wikitech_ldap.php.erb
M modules/role/manifests/deployment/mediawiki.pp
3 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/249093/1
diff --git a/modules/wikitech/manifests/wiki/passwords.pp
b/modules/deployment/manifests/wikitech.pp
similarity index 71%
rename from modules/wikitech/manifests/wiki/passwords.pp
rename to modules/deployment/manifests/wikitech.pp
index 5dde29d..04a14fc 100644
--- a/modules/wikitech/manifests/wiki/passwords.pp
+++ b/modules/deployment/manifests/wikitech.pp
@@ -1,4 +1,6 @@
-class wikitech::wiki::passwords {
+# === Class deployment::wikitech
+# Installs the private settings file for wikitech connection to ldap
+class deployment::wikitech {
include passwords::openstack::nova
$wikitech_nova_ldap_proxyagent_pass =
$passwords::openstack::nova::nova_ldap_proxyagent_pass
@@ -7,7 +9,7 @@
# Drop this file onto the mediawiki deployment host so that the passwords
are deployed
file { '/srv/mediawiki/private/WikitechPrivateLdapSettings.php':
ensure => present,
- content => template('wikitech/wikitech_ldap.php.erb'),
+ content => template('deployment/wikitech_ldap.php.erb'),
mode => '0644',
owner => 'mwdeploy',
group => 'mwdeploy',
diff --git a/modules/wikitech/templates/wikitech_ldap.php.erb
b/modules/deployment/templates/wikitech_ldap.php.erb
similarity index 100%
rename from modules/wikitech/templates/wikitech_ldap.php.erb
rename to modules/deployment/templates/wikitech_ldap.php.erb
diff --git a/modules/role/manifests/deployment/mediawiki.pp
b/modules/role/manifests/deployment/mediawiki.pp
index 62bbc79..3cf2195 100644
--- a/modules/role/manifests/deployment/mediawiki.pp
+++ b/modules/role/manifests/deployment/mediawiki.pp
@@ -12,7 +12,7 @@
include scap::master
if $::realm != 'labs' {
- include wikitech::wiki::passwords
+ include deployment::wikitech
}
# Keyholder
--
To view, visit https://gerrit.wikimedia.org/r/249093
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4a513f29dc84cf869de93bf775e3fc5de2784e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
