diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-07-21 16:24:09 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2016-08-09 14:32:57 +0100 |
| commit | 1d83f18f22d9802b6bfd667b6ff24acb812b5f0b (patch) | |
| tree | 989778145dd0a6dab395542d18483d0cc01fc521 /puppet/compute.yaml | |
| parent | 80c692af218a3266780ab795dadf619f3f4395a4 (diff) | |
Allow map_replace substitution of network names
To allow per-node data such as bind_ip's to move into the
composable services templates, we do a value substitution
on the config settings hiera map, where e.g internal_api
will be replaced with the NetIpMap IP assigned to that.
To enable subnet/uri lookup via the same method, we add
all the subnet/uri mappings to the main net_ip_map output.
Change-Id: I7850d4dc8bf4db5f7ac6a6b53c1d900b561b4580
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: |