diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-13 14:21:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-13 14:21:06 +0000 |
| commit | 2485366158bb8f439500d78c8f341c0a25db0fce (patch) | |
| tree | ef98b3c4161909ebdaae7079f5f0167811f75282 /puppet/services/nova-metadata.yaml | |
| parent | 6d72ac41c0a71a38c0f7d1b6decaac65c1d62ae2 (diff) | |
| parent | 38f98383d396d89b8f6047e57e5e606615ee5a16 (diff) | |
Merge "Only set NovaWorkers in the non-default case"
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: "" |