Cleanup parameters for keystone::bootstrap
Currently TripleO doesn't use keystone::bootstrap class, but it implements command execution as a docker_config task. This patch removes all useless puppet parameters for the class. Change-Id: I7d38c15b9e62e4d82d2e4ce6e17fb6d348a41d01
This commit is contained in:
parent
d58efb58e0
commit
3353d8cbdf
|
@ -413,7 +413,6 @@ outputs:
|
|||
read_default_group: tripleo
|
||||
|
||||
keystone::token_expiration: {get_param: TokenExpiration}
|
||||
keystone::bootstrap::password: {get_param: AdminPassword}
|
||||
keystone::policy::policies: {get_param: KeystonePolicies}
|
||||
keystone_ssl_certificate: {get_param: KeystoneSSLCertificate}
|
||||
keystone_ssl_certificate_key: {get_param: KeystoneSSLCertificateKey}
|
||||
|
@ -437,14 +436,7 @@ outputs:
|
|||
keystone::notification_driver: {get_param: NotificationDriver}
|
||||
keystone::notification_format: {get_param: KeystoneNotificationFormat}
|
||||
tripleo::profile::base::keystone::extra_notification_topics: {get_param: KeystoneNotificationTopics}
|
||||
keystone::bootstrap::email: {get_params: AdminEmail}
|
||||
keystone::bootstrap::public_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
|
||||
keystone::bootstrap::internal_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
||||
keystone::bootstrap::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
keystone::bootstrap::region: {get_param: KeystoneRegion}
|
||||
keystone::rabbit_heartbeat_timeout_threshold: 60
|
||||
keystone::bootstrap::service_project_name: 'service'
|
||||
keystone::bootstrap::project_name: 'admin'
|
||||
keystone::config::keystone_config:
|
||||
ec2/driver:
|
||||
value: 'keystone.contrib.ec2.backends.sql.Ec2'
|
||||
|
@ -610,12 +602,7 @@ outputs:
|
|||
keystone::endpoint::internal_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
||||
keystone::endpoint::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
keystone::endpoint::region: {get_param: KeystoneRegion}
|
||||
keystone::bootstrap::public_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
|
||||
keystone::bootstrap::internal_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
||||
keystone::bootstrap::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
keystone::bootstrap::region: {get_param: KeystoneRegion}
|
||||
keystone::admin_password: {get_param: AdminPassword}
|
||||
keystone::bootstrap::password: {get_param: AdminPassword}
|
||||
horizon:
|
||||
if:
|
||||
- keystone_ldap_domain_enabled
|
||||
|
|
Loading…
Reference in New Issue