diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-05 23:18:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-05 23:18:07 +0000 |
| commit | 77cca14bd760f091a1e481bd44e96f8882fb99cc (patch) | |
| tree | 645416d6ff1ade1148b5930c90a3611815ef4858 /puppet/services | |
| parent | 7c502ce91dedfb75863f54105121e9c78dd89def (diff) | |
| parent | 12b356b6875dbf0ac192fe52f4711aa746ed9eb9 (diff) | |
Merge "Remove keystone PKI related parameters"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/keystone.yaml | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml index abc738d9..d45ed86e 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -4,24 +4,11 @@ description: > OpenStack Keystone service configured with Puppet parameters: - KeystoneCACertificate: - default: '' - description: Keystone self-signed certificate authority certificate. - type: string KeystoneEnableDBPurge: default: true description: | Whether to create cron job for purging soft deleted rows in Keystone database. type: boolean - KeystoneSigningCertificate: - default: '' - description: Keystone certificate for verifying token validity. - type: string - KeystoneSigningKey: - default: '' - description: Keystone key for signing tokens. - type: string - hidden: true KeystoneSSLCertificate: default: '' description: Keystone certificate for verifying token validity. @@ -105,9 +92,6 @@ outputs: - '/keystone' keystone::admin_token: {get_param: AdminToken} keystone::roles::admin::password: {get_param: AdminPassword} - keystone_ca_certificate: {get_param: KeystoneCACertificate} - keystone_signing_key: {get_param: KeystoneSigningKey} - keystone_signing_certificate: {get_param: KeystoneSigningCertificate} keystone_ssl_certificate: {get_param: KeystoneSSLCertificate} keystone_ssl_certificate_key: {get_param: KeystoneSSLCertificateKey} keystone::enable_proxy_headers_parsing: true |