diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-10 23:55:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-10 23:55:17 +0000 |
| commit | 0665389da42f285fa4d762223be13e5cc79c8a5d (patch) | |
| tree | aa79ac3b89edac8df881b913afa6e80a459d1b86 /puppet/compute.yaml | |
| parent | dae7f72898dec10a53d724d989dd7083b60c40b5 (diff) | |
| parent | 1d83f18f22d9802b6bfd667b6ff24acb812b5f0b (diff) | |
Merge "Allow map_replace substitution of network names"
Diffstat (limited to 'puppet/compute.yaml')
| -rw-r--r-- | puppet/compute.yaml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index dcb3c39a..e029c605 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2015-10-15 +heat_template_version: 2016-10-14 description: > OpenStack hypervisor node configured via Puppet. @@ -382,7 +382,10 @@ resources: mapped_data: service_names: {get_param: ServiceNames} service_configs: - mapped_data: {get_param: ServiceConfigSettings} + mapped_data: + map_replace: + - {get_param: ServiceConfigSettings} + - values: {get_attr: [NetIpMap, net_ip_map]} compute_extraconfig: mapped_data: {get_param: NovaComputeExtraConfig} extraconfig: |