openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Change neutron-metadata number of workers determination method"

This commit is contained in:
Jenkins 2017-05-15 12:59:05 +00:00 committed by Gerrit Code Review
parent 16cae1759f 02a086bdb9
commit 1916259308
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
puppet/services/neutron-metadata.yaml
View File

@ -54,6 +54,9 @@ parameters:
tag: openstack.neutron.agent.metadata
path: /var/log/neutron/metadata-agent.log
conditions:
neutron_workers_unset: {equals : [{get_param: NeutronWorkers}, '']}
resources:
NeutronBase:
@ -78,11 +81,15 @@ outputs:
map_merge:
- get_attr: [NeutronBase, role_data, config_settings]
- neutron::agents::metadata::shared_secret: {get_param: NeutronMetadataProxySharedSecret}
neutron::agents::metadata::metadata_workers: {get_param: NeutronWorkers}
neutron::agents::metadata::auth_password: {get_param: NeutronPassword}
neutron::agents::metadata::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
neutron::agents::metadata::auth_tenant: 'service'
neutron::agents::metadata::metadata_ip: "%{hiera('nova_metadata_vip')}"
-
if:
- neutron_workers_unset
- {}
- neutron::agents::metadata::metadata_workers: {get_param: NeutronWorkers}
step_config: |
include tripleo::profile::base::neutron::metadata
upgrade_tasks: