From 29c64b73f749364867be78a474410fe062eba99e Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 2 Jan 2018 05:30:39 +0100
Subject: [baremetal] prx: Add management network VIP

Include `openstack_web_public_vip` class for setting up the
old VIP in the public network, use old class for mgmt VIP.
Also change the generic hostname 'prx' to point inside mgmt net.

Change-Id: Iff69394f16ede290d149a26b054a85371f00f8e0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 .../cluster/baremetal-mcp-pike-common-ha/openstack_init.yml       | 3 ++-
 .../cluster/baremetal-mcp-pike-common-ha/openstack_proxy.yml      | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha')

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml
index 0d4c66682..8f4edefea 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml
@@ -12,6 +12,7 @@ parameters:
     openstack_version: pike
 
     # openstack service addresses
+    openstack_proxy_control_address: ${_param:opnfv_openstack_proxy_control_address}
     openstack_proxy_node01_control_address: ${_param:opnfv_openstack_proxy_node01_control_address}
     openstack_proxy_node02_control_address: ${_param:opnfv_openstack_proxy_node02_control_address}
     openstack_proxy_address: ${_param:opnfv_openstack_proxy_address}
@@ -200,7 +201,7 @@ parameters:
     network:
       host:
         prx:
-          address: ${_param:openstack_proxy_address}
+          address: ${_param:openstack_proxy_control_address}
           names:
             - ${_param:openstack_proxy_hostname}
             - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_proxy.yml
index 0add63965..f83590ced 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_proxy.yml
@@ -17,16 +17,20 @@ classes:
   - system.salt.minion.cert.proxy
   - system.sphinx.server.doc.reclass
   - service.keepalived.cluster.single
+  - system.keepalived.cluster.instance.openstack_web_public_vip
 parameters:
   _param:
-    keepalived_vip_interface: ${_param:single_nic}
+    cluster_vip_address: ${_param:openstack_proxy_address}
+    keepalived_openstack_web_public_vip_address: ${_param:cluster_vip_address}
+    keepalived_openstack_web_public_vip_interface: ${_param:single_nic}
+    keepalived_vip_address: ${_param:openstack_proxy_control_address}
+    keepalived_vip_interface: ${_param:control_nic}
     keepalived_vip_virtual_router_id: 240
     nginx_proxy_ssl:
       enabled: true
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    cluster_vip_address: ${_param:openstack_proxy_address}
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
   linux:
     system:
-- 
cgit 1.2.3-korg