diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-15 12:59:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-15 12:59:05 +0000 |
| commit | 1916259308c645d659a4428e26c16a4c5a89c9e4 (patch) | |
| tree | 0610dc31725dbcc66a03a4480da7c6584b14d077 /puppet | |
| parent | 16cae1759fe5606d15a33d31f962ca757f499e1e (diff) | |
| parent | 02a086bdb95fb55e920e0ff9307bc362e4d55979 (diff) | |
Merge "Change neutron-metadata number of workers determination method"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/neutron-metadata.yaml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/puppet/services/neutron-metadata.yaml b/puppet/services/neutron-metadata.yaml index 7d9c73eb..ec4a3df6 100644 --- a/puppet/services/neutron-metadata.yaml +++ b/puppet/services/neutron-metadata.yaml @@ -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: |