Ryan Lane has submitted this change and it was merged.
Change subject: Move the keystone token driver password back into common
......................................................................
Move the keystone token driver password back into common
There's no need to split this config by realm or site.
Change-Id: I183615141cb08c7c4d2c12c114f3a7d1a6f239ab
---
M manifests/role/keystone.pp
1 file changed, 1 insertion(+), 6 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/keystone.pp b/manifests/role/keystone.pp
index c82dc07..419e411 100644
--- a/manifests/role/keystone.pp
+++ b/manifests/role/keystone.pp
@@ -17,6 +17,7 @@
auth_protocol => "http",
auth_port => "35357",
admin_token =>
$passwords::openstack::keystone::keystone_admin_token,
+ token_driver_password =>
$passwords::openstack::keystone::keystone_db_pass,
}
}
class role::keystone::config::pmtpa inherits role::keystone::config {
@@ -36,9 +37,6 @@
token_driver => $realm ? {
'production' => 'sql',
'labs' => 'redis',
- },
- token_driver_password => $realm ? {
- 'labs' =>
$passwords::openstack::keystone::keystone_db_pass,
},
}
$keystoneconfig = merge($pmtpakeystoneconfig, $commonkeystoneconfig)
@@ -61,9 +59,6 @@
token_driver => $realm ? {
'production' => 'redis',
'labs' => 'redis',
- },
- token_driver_password => $realm ? {
- 'labs' =>
$passwords::openstack::keystone::keystone_db_pass,
},
}
$keystoneconfig = merge($eqiadkeystoneconfig, $commonkeystoneconfig)
--
To view, visit https://gerrit.wikimedia.org/r/114425
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I183615141cb08c7c4d2c12c114f3a7d1a6f239ab
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <rl...@wikimedia.org>
Gerrit-Reviewer: Ryan Lane <rl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
