diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-10-11 12:09:43 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-10-12 14:17:54 -0400 |
| commit | 38f98383d396d89b8f6047e57e5e606615ee5a16 (patch) | |
| tree | 2e9bde67f1b8d90f4bc0d7d08bcfed89278640aa /puppet/services/nova-metadata.yaml | |
| parent | a80d13b6e168c59d9860898063cf2c7067a65532 (diff) | |
Only set NovaWorkers in the non-default case
This patch updates the t-h-t templates for
nova services so that we only set the value of workers in
the non-default case. TripleO has always defaulted the
workers count to 0 and there was recently a regression in
nova where they treat the default of 0 as invalid (a bug
that may get fixed in nova but we don't want to wait on it)
This patch avoids the issue by allowing the default value
to be unset if the TripleO default of 0 is configured.
Change-Id: I175977b88129d87caeb32332d47eb14816a6d5d4
Closes-bug: #1631133
Diffstat (limited to 'puppet/services/nova-metadata.yaml')
| -rw-r--r-- | puppet/services/nova-metadata.yaml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/puppet/services/nova-metadata.yaml b/puppet/services/nova-metadata.yaml index 92373c56..40931da6 100644 --- a/puppet/services/nova-metadata.yaml +++ b/puppet/services/nova-metadata.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2016-04-08 +heat_template_version: 2016-10-14 description: > OpenStack Nova API service configured with Puppet @@ -23,12 +23,20 @@ parameters: description: Number of workers for Nova API service. type: number +conditions: + nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]} + outputs: role_data: description: Role data for the Nova Metadata service. value: service_name: nova_metadata config_settings: - nova::api::metadata_workers: {get_param: NovaWorkers} - nova::api::metadata_listen: {get_param: [ServiceNetMap, NovaMetadataNetwork]} + map_merge: + - nova::api::metadata_listen: {get_param: [ServiceNetMap, NovaMetadataNetwork]} + - + if: + - nova_workers_zero + - {} + - nova::api::metadata_workers: {get_param: NovaWorkers} step_config: "" |