Update authtoken parameters to match recent changes
Update authtoken parameters for: - Aodh - Ironic - Manila - Nova - Ceilometer Change-Id: Ie123b8da1a7af2e406aadca4775de9e8c4e6e1f5
This commit is contained in:
parent
a95e4c2afe
commit
b5a54bf985
@ -715,11 +715,8 @@ resources:
|
||||
# Nova
|
||||
nova::upgrade_level_compute: {get_input: upgrade_level_nova_compute}
|
||||
nova::use_ipv6: {get_input: nova_ipv6}
|
||||
nova::api::auth_uri: {get_input: keystone_auth_uri}
|
||||
nova::api::identity_uri: {get_input: keystone_identity_uri}
|
||||
nova::api::api_bind_address: {get_input: nova_api_network}
|
||||
nova::api::metadata_listen: {get_input: nova_metadata_network}
|
||||
nova::api::admin_password: {get_input: nova_password}
|
||||
nova::glance_api_servers: {get_input: glance_api_servers}
|
||||
nova::api::neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
|
||||
nova::api::instance_name_template: {get_input: instance_name_template}
|
||||
|
@ -37,7 +37,6 @@ outputs:
|
||||
- get_attr: [AodhBase, role_data, config_settings]
|
||||
- aodh::wsgi::apache::ssl: false
|
||||
aodh::api::service_name: 'httpd'
|
||||
aodh::api::keystone_tenant: 'service'
|
||||
- tripleo.aodh_api.firewall_rules:
|
||||
'128 aodh-api':
|
||||
dport:
|
||||
|
@ -82,9 +82,10 @@ outputs:
|
||||
aodh::rabbit_password: {get_param: RabbitPassword}
|
||||
aodh::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
|
||||
aodh::rabbit_port: {get_param: RabbitClientPort}
|
||||
aodh::api::keystone_password: {get_param: AodhPassword}
|
||||
aodh::api::keystone_auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||
aodh::api::keystone_identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
|
||||
aodh::keystone::authtoken::project_name: 'service'
|
||||
aodh::keystone::authtoken::password: {get_param: AodhPassword}
|
||||
aodh::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||
aodh::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
|
||||
aodh::auth::auth_password: {get_param: AodhPassword}
|
||||
aodh::keystone::auth::public_url: {get_param: [EndpointMap, AodhPublic, uri]}
|
||||
aodh::keystone::auth::internal_url: {get_param: [EndpointMap, AodhInternal, uri]}
|
||||
|
@ -41,6 +41,5 @@ outputs:
|
||||
dport:
|
||||
- 8777
|
||||
- 13777
|
||||
- ceilometer::api::keystone_tenant: 'service'
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::ceilometer::api
|
||||
|
@ -91,9 +91,10 @@ outputs:
|
||||
ceilometer::metering_secret: {get_param: CeilometerMeteringSecret}
|
||||
# we include db_sync class in puppet-tripleo
|
||||
ceilometer::db::sync_db: false
|
||||
ceilometer::api::keystone_password: {get_param: CeilometerPassword}
|
||||
ceilometer::api::keystone_auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||
ceilometer::api::keystone_identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
|
||||
ceilometer::keystone::authtoken::project_name: 'service'
|
||||
ceilometer::keystone::authtoken::password: {get_param: CeilometerPassword}
|
||||
ceilometer::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||
ceilometer::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
|
||||
ceilometer::agent::auth::auth_password: {get_param: CeilometerPassword}
|
||||
ceilometer::agent::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
|
||||
ceilometer::agent::notification::store_events: {get_param: CeilometerStoreEvents}
|
||||
|
@ -45,11 +45,11 @@ outputs:
|
||||
# the TFTP server IP in ironic-conductor.yaml as it should not be
|
||||
# the VIP, but rather a real IP of the controller.
|
||||
- ironic::my_ip: {get_param: [EndpointMap, MysqlInternal, host]}
|
||||
ironic::api::admin_password: {get_param: IronicPassword}
|
||||
ironic::api::admin_tenant_name: 'service'
|
||||
ironic::api::admin_user: 'ironic'
|
||||
ironic::api::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||
ironic::api::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
ironic::api::authtoken::password: {get_param: IronicPassword}
|
||||
ironic::api::authtoken::project_name: 'service'
|
||||
ironic::api::authtoken::username: 'ironic'
|
||||
ironic::api::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||
ironic::api::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
ironic::api::port: {get_param: [EndpointMap, IronicInternal, port]}
|
||||
# This is used to build links in responses
|
||||
ironic::api::public_endpoint: {get_param: [EndpointMap, IronicPublic, uri_no_suffix]}
|
||||
|
@ -43,9 +43,10 @@ outputs:
|
||||
config_settings:
|
||||
map_merge:
|
||||
- get_attr: [ManilaBase, role_data, config_settings]
|
||||
- manila::api::keystone_password: {get_param: ManilaPassword}
|
||||
manila::api::keystone_auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
||||
manila::api::keystone_auth_host: {get_param: [EndpointMap, ManilaInternal, host]}
|
||||
- manila::keystone::authtoken::password: {get_param: ManilaPassword}
|
||||
manila::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
||||
manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
|
||||
manila::keystone::authtoken::project_name: 'service'
|
||||
manila::keystone::auth::public_url: {get_param: [EndpointMap, ManilaV1Public, uri]}
|
||||
manila::keystone::auth::internal_url: {get_param: [EndpointMap, ManilaV1Internal, uri]}
|
||||
manila::keystone::auth::admin_url: {get_param: [EndpointMap, ManilaV1Admin, uri]}
|
||||
@ -54,7 +55,6 @@ outputs:
|
||||
manila::keystone::auth::admin_url_v2: {get_param: [EndpointMap, ManilaAdmin, uri]}
|
||||
manila::keystone::auth::password: {get_param: ManilaPassword }
|
||||
manila::keystone::auth::region: {get_param: KeystoneRegion }
|
||||
manila::api::keystone_tenant: 'service'
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::manila::api
|
||||
|
||||
|
@ -61,7 +61,10 @@ outputs:
|
||||
- 8774
|
||||
- 13774
|
||||
- 8775
|
||||
nova::api::admin_tenant_name: 'service'
|
||||
nova::keystone::authtoken::project_name: 'service'
|
||||
nova::keystone::authtoken::password: {get_param: NovaPassword}
|
||||
nova::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||
nova::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
nova::api::enabled: true
|
||||
nova::api::default_floating_pool: 'public'
|
||||
nova::api::sync_db_api: true
|
||||
|
Loading…
x
Reference in New Issue
Block a user