summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-21 17:13:22 +0000
committerGerrit Code Review <review@openstack.org>2016-10-21 17:13:22 +0000
commit9b3aba0309af54991d3e24b0ca147426a5b815a5 (patch)
treed2c2e0777a26052a3a9416c613140b80497fc2c7 /puppet/services
parentec02ba63193efbff517c6a50cc7157d0a0d298ea (diff)
parent333f6b322765100f2d2fb9d9f4b8426a9a8dde45 (diff)
Merge "Use correct password for keystone bootstrap"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/keystone.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index d1765fcc..1f83b680 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -134,6 +134,7 @@ outputs:
- {get_param: [EndpointMap, MysqlInternal, host]}
- '/keystone'
keystone::admin_token: {get_param: AdminToken}
+ keystone::admin_password: {get_param: AdminPassword}
keystone::roles::admin::password: {get_param: AdminPassword}
keystone_ssl_certificate: {get_param: KeystoneSSLCertificate}
keystone_ssl_certificate_key: {get_param: KeystoneSSLCertificateKey}