Merge "Replace deprecated nova::os_region_name"
This commit is contained in:
commit
8043956c8c
|
@ -221,7 +221,6 @@ outputs:
|
|||
nova::placement::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
||||
nova::placement::region_name: {get_param: KeystoneRegion}
|
||||
nova::placement::valid_interfaces: {get_param: PlacementAPIInterface}
|
||||
nova::os_region_name: {get_param: KeystoneRegion}
|
||||
nova::logging::debug:
|
||||
if:
|
||||
- {get_param: NovaDebug}
|
||||
|
@ -237,6 +236,7 @@ outputs:
|
|||
nova::network::neutron::valid_interfaces: 'internal'
|
||||
nova::rabbit_heartbeat_timeout_threshold: 60
|
||||
nova::cinder::catalog_info: 'volumev3:cinderv3:internalURL'
|
||||
nova::cinder::os_region_name: {get_param: KeystoneRegion}
|
||||
# NOTE(tkajinam): Make sure the default (services) is overridden
|
||||
nova::cinder::project_name: 'service'
|
||||
nova::host: "%{lookup('fqdn_canonical')}"
|
||||
|
|
Loading…
Reference in New Issue