From 749a99a5cd53d4c5308e38f97f6d2d1439a262ad Mon Sep 17 00:00:00 2001
From: Bob Fournier <bfournie@redhat.com>
Date: Wed, 3 Jan 2018 18:43:21 -0500
Subject: [PATCH] Add composable network VIPs for puppet configuration

Adds new hiera parameters for VIPs for all isolated networks including
any custom composable networks.  The existing hard-coded network parameters
can be removed when the puppet-tripleo change
https://review.openstack.org/#/c/531037 merges that no longer uses them.

The new network_virtual_ips paramater contains the network name, vip, and
an index used to generate the vrouter_id in puppet-tripleo.

Change-Id: If8d3219a0714e3db34980e884dce84912a837865
Partial-Bug: 1741129
---
 puppet/all-nodes-config.j2.yaml                     | 13 +++++++++++++
 .../composable-network-vips-4d7b28fa3769d38b.yaml   |  4 ++++
 2 files changed, 17 insertions(+)
 create mode 100644 releasenotes/notes/composable-network-vips-4d7b28fa3769d38b.yaml

diff --git a/puppet/all-nodes-config.j2.yaml b/puppet/all-nodes-config.j2.yaml
index e44a48c863..7098a67cb1 100644
--- a/puppet/all-nodes-config.j2.yaml
+++ b/puppet/all-nodes-config.j2.yaml
@@ -184,7 +184,19 @@ resources:
                 public_virtual_ip: {get_param: [NetVipMap, {get_param: ExternalNetName}]}
                 controller_virtual_ip: {get_param: [NetVipMap, ctlplane]}
 {%- for network in networks if network.vip|default(false) %}
+                # TODO - remove these when puppet-tripleo patch https://review.openstack.org/#/c/531037 merges
+                # the internal_api_virtual_ip will still be needed for now however, as its used by contrail
                 {{network.name_lower}}_virtual_ip: {get_param: [NetVipMap, {get_param: {{network.name}}NetName}]}
+{%- endfor %}
+                network_virtual_ips:
+{% set count = 1 %}
+{%- for network in networks if network.vip|default(false) %}
+{%- if network.name != 'External' %}
+                  {{network.name_lower}}:
+                    ip_address: {get_param: [NetVipMap, {get_param: {{network.name}}NetName}]}
+                    index: {{count}}
+{% set count = count + 1 %}
+{%- endif %}
 {%- endfor %}
                 redis_vip: {get_param: RedisVirtualIP}
                 # public_virtual_ip and controller_virtual_ip are needed in
@@ -193,6 +205,7 @@ resources:
                 tripleo::haproxy::controller_virtual_ip: {get_param: [NetVipMap, ctlplane]}
                 tripleo::keepalived::public_virtual_ip: {get_param: [NetVipMap, {get_param: ExternalNetName}]}
                 tripleo::keepalived::controller_virtual_ip: {get_param: [NetVipMap, ctlplane]}
+                # TODO - remove virtual_ips when puppet-tripleo patch https://review.openstack.org/#/c/531037 merges
                 tripleo::keepalived::internal_api_virtual_ip: {get_param: [NetVipMap, {get_param: InternalApiNetName}]}
                 tripleo::keepalived::storage_virtual_ip: {get_param: [NetVipMap, {get_param: StorageNetName}]}
                 tripleo::keepalived::storage_mgmt_virtual_ip: {get_param: [NetVipMap, {get_param: StorageMgmtNetName}]}
diff --git a/releasenotes/notes/composable-network-vips-4d7b28fa3769d38b.yaml b/releasenotes/notes/composable-network-vips-4d7b28fa3769d38b.yaml
new file mode 100644
index 0000000000..150a5a34ab
--- /dev/null
+++ b/releasenotes/notes/composable-network-vips-4d7b28fa3769d38b.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - Added hiera for network_virtual_ips in vip_data to allow
+    composable networks to be configured in puppet.