openstack/tripleo-heat-templates
Code Issues Proposed changes

Set region_name for service authentication in ironic

Browse Source 
... because region_name should be set according to the KeystoneRegion
parameter.

Depends-on: https://review.opendev.org/#/c/720884/
Change-Id: Icce3767e6954133f50da7f3d9bc087a80cea8d20
This commit is contained in:
Takashi Kajinami 2020-04-13 14:48:18 +09:00
parent 9b0c17ab58
commit 4130d9fee5
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/ironic/ironic-conductor-container-puppet.yaml
View File

@ -40,6 +40,10 @@ parameters:
default: {}
description: Parameters specific to the role
type: json
KeystoneRegion:
type: string
default: 'regionOne'
description: Keystone region for endpoint
IronicConfigureSwiftTempUrlKey:
default: true
description: Whether to configure Swift temporary URLs for use with
@ -402,18 +406,21 @@ outputs:
ironic::cinder::project_name: 'service'
ironic::cinder::user_domain_name: 'Default'
ironic::cinder::project_domain_name: 'Default'
ironic::cinder::region_name: {get_param: KeystoneRegion}
ironic::glance::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
ironic::glance::username: 'ironic'
ironic::glance::password: {get_param: IronicPassword}
ironic::glance::project_name: 'service'
ironic::glance::user_domain_name: 'Default'
ironic::glance::project_domain_name: 'Default'
ironic::glance::region_name: {get_param: KeystoneRegion}
ironic::neutron::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
ironic::neutron::username: 'ironic'
ironic::neutron::password: {get_param: IronicPassword}
ironic::neutron::project_name: 'service'
ironic::neutron::user_domain_name: 'Default'
ironic::neutron::project_domain_name: 'Default'
ironic::neutron::region_name: {get_param: KeystoneRegion}
ironic::neutron::dhcpv6_stateful_address_count: {get_param: IronicDhcpv6StatefulAddressCount}
ironic::service_catalog::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
ironic::service_catalog::username: 'ironic'
@ -421,12 +428,14 @@ outputs:
ironic::service_catalog::project_name: 'service'
ironic::service_catalog::user_domain_name: 'Default'
ironic::service_catalog::project_domain_name: 'Default'
ironic::service_catalog::region_name: {get_param: KeystoneRegion}
ironic::swift::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
ironic::swift::username: 'ironic'
ironic::swift::password: {get_param: IronicPassword}
ironic::swift::project_name: 'service'
ironic::swift::user_domain_name: 'Default'
ironic::swift::project_domain_name: 'Default'
ironic::swift::region_name: {get_param: KeystoneRegion}
# ironic-inspector support is not implemented, but let's configure
# the credentials for consistency.
ironic::drivers::inspector::enabled: false
@ -436,6 +445,7 @@ outputs:
ironic::drivers::inspector::project_name: 'service'
ironic::drivers::inspector::user_domain_name: 'Default'
ironic::drivers::inspector::project_domain_name: 'Default'
ironic::drivers::inspector::region_name: {get_param: KeystoneRegion}
tripleo::profile::base::ironic::conductor::enable_staging: {get_param: IronicEnableStagingDrivers}
# to avoid hard linking errors we store these on the same
# volume/device as the ironic master_path