diff options
| author |   Or Idgar <oidgar@redhat.com> | 2017-05-10 09:50:51 +0000 |
|---|---|---|
| committer | Or Idgar <oidgar@redhat.com> | 2017-05-10 11:45:34 +0000 |
| commit | 02a086bdb95fb55e920e0ff9307bc362e4d55979 (patch) | |
| tree | 13cdf29d1c65ac934d15eecf014287e08807ce88 | |
| parent | dd6c1064eae369f672478a01f9fe2f835485fdc5 (diff) | |
Change neutron-metadata number of workers determination method
neutron-metadata number of workers will be taken from NeutronWorkers parameter
if not empty. when empty, all keys related to NeutronWorkers value will be
set with empty dictionary instead empty string ({}).
Change-Id: I18347639c188bbf085e2f3c739465e52c94b9d77
Closes-bug: #1689571
| -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 32ef567c..89c07926 100644 --- a/puppet/services/neutron-metadata.yaml +++ b/puppet/services/neutron-metadata.yaml @@ -46,6 +46,9 @@ parameters: tag: openstack.neutron.agent.metadata path: /var/log/neutron/metadata-agent.log +conditions: + neutron_workers_unset: {equals : [{get_param: NeutronWorkers}, '']} + resources: NeutronBase: @@ -68,11 +71,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: |