From 180d391e3e9a6ee471c1ecf91aecbf04e2b9c1f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harald=20Jens=C3=A5s?= <hjensas@redhat.com>
Date: Wed, 22 Jan 2020 13:24:57 +0100
Subject: [PATCH] Add network vip mapping into service data

Make it possible to resolve network virtual ips from
within a service template. The data is transported in
the existing ServiceData property wich is wired into
all services.

The data can be consumed in service templates, replacing
the need for hiera interpolation for network virtual ips.

Related: RHBZ#1791338
Closes-Bug: #1860545
Change-Id: I24c239174d8d066bd2cb4300a21fa1d38a3e80cd
(cherry picked from commit eac636c9e66cde459bc1e1802a67f00136b9734e)
---
 overcloud.j2.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index cb897ccd60..e8cc7774b5 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -432,6 +432,7 @@ resources:
       ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
       ServiceData:
         net_cidr_map: {get_attr: [NetCidrMapValue, value]}
+        net_vip_map: {get_attr: [VipMap, net_ip_map]}
       EndpointMap: {get_attr: [EndpointMapData, value]}
       DefaultPasswords: {get_attr: [DefaultPasswords, passwords]}
       RoleName: {{role.name}}