diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-20 13:52:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-20 13:52:50 +0000 |
| commit | 1fc0346dd3ced1aa044d16d247ef80e8b857117b (patch) | |
| tree | 8c0a37fe1b133cd545df4ed28dfc68d57b7d844b /puppet/services/nova-base.yaml | |
| parent | aecb4e767cf5bcef9743d54fdefcfe1270af9434 (diff) | |
| parent | cb56496b64724d7fb6b7817111bb94726ffbba2e (diff) | |
Merge "Move nova placement hiera to nova-base"
Diffstat (limited to 'puppet/services/nova-base.yaml')
| -rw-r--r-- | puppet/services/nova-base.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index 454aca0f..c448bf49 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -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: - '' |