Merge "Add keystone::bootstrap hiera data"
This commit is contained in:
commit
a8daeb4267
|
@ -370,6 +370,7 @@ outputs:
|
||||||
keystone::admin_token: {get_param: AdminToken}
|
keystone::admin_token: {get_param: AdminToken}
|
||||||
keystone::admin_password: {get_param: AdminPassword}
|
keystone::admin_password: {get_param: AdminPassword}
|
||||||
keystone::roles::admin::password: {get_param: AdminPassword}
|
keystone::roles::admin::password: {get_param: AdminPassword}
|
||||||
|
keystone::bootstrap::password: {get_param: AdminPassword}
|
||||||
keystone::policy::policies: {get_param: KeystonePolicies}
|
keystone::policy::policies: {get_param: KeystonePolicies}
|
||||||
keystone_ssl_certificate: {get_param: KeystoneSSLCertificate}
|
keystone_ssl_certificate: {get_param: KeystoneSSLCertificate}
|
||||||
keystone_ssl_certificate_key: {get_param: KeystoneSSLCertificateKey}
|
keystone_ssl_certificate_key: {get_param: KeystoneSSLCertificateKey}
|
||||||
|
@ -394,16 +395,23 @@ outputs:
|
||||||
keystone::notification_format: {get_param: KeystoneNotificationFormat}
|
keystone::notification_format: {get_param: KeystoneNotificationFormat}
|
||||||
tripleo::profile::base::keystone::extra_notification_topics: {get_param: KeystoneNotificationTopics}
|
tripleo::profile::base::keystone::extra_notification_topics: {get_param: KeystoneNotificationTopics}
|
||||||
keystone::roles::admin::email: {get_param: AdminEmail}
|
keystone::roles::admin::email: {get_param: AdminEmail}
|
||||||
|
keystone::bootstrap::email: {get_params: AdminEmail}
|
||||||
keystone::roles::admin::password: {get_param: AdminPassword}
|
keystone::roles::admin::password: {get_param: AdminPassword}
|
||||||
keystone::endpoint::public_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
|
keystone::endpoint::public_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
|
||||||
keystone::endpoint::internal_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
keystone::endpoint::internal_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
||||||
keystone::endpoint::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
keystone::endpoint::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||||
keystone::endpoint::region: {get_param: KeystoneRegion}
|
keystone::endpoint::region: {get_param: KeystoneRegion}
|
||||||
keystone::endpoint::version: ''
|
keystone::endpoint::version: ''
|
||||||
|
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_port: {get_param: [EndpointMap, KeystoneAdmin, port]}
|
keystone::admin_port: {get_param: [EndpointMap, KeystoneAdmin, port]}
|
||||||
keystone::rabbit_heartbeat_timeout_threshold: 60
|
keystone::rabbit_heartbeat_timeout_threshold: 60
|
||||||
keystone::roles::admin::service_tenant: 'service'
|
keystone::roles::admin::service_tenant: 'service'
|
||||||
|
keystone::bootstrap::service_project_name: 'service'
|
||||||
keystone::roles::admin::admin_tenant: 'admin'
|
keystone::roles::admin::admin_tenant: 'admin'
|
||||||
|
keystone::bootstrap::project_name: 'admin'
|
||||||
keystone::config::keystone_config:
|
keystone::config::keystone_config:
|
||||||
ec2/driver:
|
ec2/driver:
|
||||||
value: 'keystone.contrib.ec2.backends.sql.Ec2'
|
value: 'keystone.contrib.ec2.backends.sql.Ec2'
|
||||||
|
@ -557,7 +565,12 @@ outputs:
|
||||||
keystone::endpoint::internal_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
keystone::endpoint::internal_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
||||||
keystone::endpoint::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
keystone::endpoint::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||||
keystone::endpoint::region: {get_param: KeystoneRegion}
|
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::admin_password: {get_param: AdminPassword}
|
||||||
|
keystone::bootstrap::password: {get_param: AdminPassword}
|
||||||
horizon:
|
horizon:
|
||||||
if:
|
if:
|
||||||
- keystone_ldap_domain_enabled
|
- keystone_ldap_domain_enabled
|
||||||
|
|
Loading…
Reference in New Issue