diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-03 03:09:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-03 03:09:30 +0000 |
| commit | f2e2ce264bcd3b18d1ebe8961eec882289c77e40 (patch) | |
| tree | f429408bcf3106ac1d3f1a472ffbc3d04149829a /puppet/role.role.j2.yaml | |
| parent | 41e049ae7c55d178459c1394839c6827a654c345 (diff) | |
| parent | 7779bc8ad0ab43e2f57225cfded51e7e2ae18004 (diff) | |
Merge "Add NetIpMap to hieradata for *ExtraConfig overrides" into stable/pike
Diffstat (limited to 'puppet/role.role.j2.yaml')
| -rw-r--r-- | puppet/role.role.j2.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index 15da1773..d53afd04 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -565,6 +565,7 @@ resources: - bootstrap_node # provided by allNodesConfig - all_nodes # provided by allNodesConfig - vip_data # provided by allNodesConfig + - net_ip_map - '"%{::osfamily}"' # The following are required for compatibility with the Controller role # where some vendor integrations added hieradata via ExtraConfigPre @@ -578,6 +579,7 @@ resources: service_names: service_names: {get_param: ServiceNames} sensu::subscriptions: {get_param: MonitoringSubscriptions} + net_ip_map: {get_attr: [NetIpMap, net_ip_map]} service_configs: map_replace: - {get_param: ServiceConfigSettings} |