summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorAlex Schultz <aschultz@redhat.com>2016-09-19 11:08:06 -0600
committerAlex Schultz <aschultz@redhat.com>2016-09-27 22:03:24 +0000
commit333f6b322765100f2d2fb9d9f4b8426a9a8dde45 (patch)
tree986a4cdef1f69c5a372f30622a4c2eef3f1a58dc /puppet
parent8b38376787cad1dfb6a6142b581ca4229827ae71 (diff)
Use correct password for keystone bootstrap
In upstream puppet-keystone, the boostrap process should use an admin password not the admin token for the bootstrapping of keystone. The admin password option is being added to the upstream class so we will need to provide it to properly have keystone bootstrapped. Change-Id: Icab4b0cb70d6caf2f2792c4fe730f060b807fbc1 Depends-On: I7a706d93b43ec025bdb4b29667f64ff2f7dd52a0 Related-Bug: #1621959
Diffstat (limited to 'puppet')
-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 b7a807fa..0dd02437 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -130,6 +130,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}