Move nova placement hiera to nova-base
Nova placement hiera parameters need to be common across all nova services because they are used to more than one place. This patch moves them to nova-base, so nova-compute and other services that need it will be able to run correctly. Change-Id: Ibccc55fc9d045487fb7e47bd1c2ebe9cf788765e Depends-On: Iada8e9fcccec7dbfe7ac0ec0f9ec6eac1581290e
This commit is contained in:
parent
6551bec38f
commit
cb56496b64
puppet/services
@ -18,6 +18,10 @@ parameters:
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
KeystoneRegion:
|
||||
type: string
|
||||
default: 'regionOne'
|
||||
description: Keystone region for endpoint
|
||||
NovaPassword:
|
||||
description: The password for the nova service and db account, used by nova-api.
|
||||
type: string
|
||||
@ -128,6 +132,10 @@ outputs:
|
||||
nova::rabbit_userid: {get_param: RabbitUserName}
|
||||
nova::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
|
||||
nova::rabbit_port: {get_param: RabbitClientPort}
|
||||
nova::placement::project_name: 'service'
|
||||
nova::placement::password: {get_param: NovaPassword}
|
||||
nova::placement::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
nova::placement::os_region_name: {get_param: KeystoneRegion}
|
||||
nova::database_connection:
|
||||
list_join:
|
||||
- ''
|
||||
|
@ -79,10 +79,6 @@ outputs:
|
||||
dport:
|
||||
- 8778
|
||||
- 13778
|
||||
nova::placement::project_name: 'service'
|
||||
nova::placement::password: {get_param: NovaPassword}
|
||||
nova::placement::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
nova::placement::os_region_name: {get_param: KeystoneRegion}
|
||||
nova::wsgi::apache_placement::api_port: '8778'
|
||||
nova::wsgi::apache_placement::ssl: {get_param: EnableInternalTLS}
|
||||
# NOTE: bind IP is found in Heat replacing the network name with the local node IP
|
||||
|
Loading…
x
Reference in New Issue
Block a user