From 28af31a03561d8dd97db5d6d4b155b5489e3b84d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii 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 (cherry picked from commit 29c64b73f749364867be78a474410fe062eba99e) --- ...002-Add-proxy-node-management-network-VIP.patch | 29 ++++++++++++++++++++++ .../opnfv/pod_config.yml.example | 1 + .../openstack_init.yml | 3 ++- .../openstack_proxy.yml | 8 ++++-- 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 mcp/patches/pharos/0002-Add-proxy-node-management-network-VIP.patch diff --git a/mcp/patches/pharos/0002-Add-proxy-node-management-network-VIP.patch b/mcp/patches/pharos/0002-Add-proxy-node-management-network-VIP.patch new file mode 100644 index 000000000..346d7505c --- /dev/null +++ b/mcp/patches/pharos/0002-Add-proxy-node-management-network-VIP.patch @@ -0,0 +1,29 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii +Date: Mon, 1 Jan 2018 17:06:59 +0100 +Subject: [PATCH] Add proxy node management network VIP + +Signed-off-by: Alexandru Avadanii +--- + config/installers/fuel/pod_config.yml.j2 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 +index f380535..2d0cdee 100644 +--- a/config/installers/fuel/pod_config.yml.j2 ++++ b/config/installers/fuel/pod_config.yml.j2 +@@ -61,6 +61,7 @@ parameters: + opnfv_openstack_proxy_address: {{ net_public | ipaddr_index('103') }} + opnfv_openstack_proxy_node01_address: {{ net_public | ipaddr_index('104') }} + opnfv_openstack_proxy_node02_address: {{ net_public | ipaddr_index('105') }} ++ opnfv_openstack_proxy_control_address: {{ net_mgmt | ipaddr_index('103') }} + opnfv_openstack_proxy_node01_control_address: {{ net_mgmt | ipaddr_index('104') }} + opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | ipaddr_index('105') }} + opnfv_openstack_control_address: {{ net_mgmt | ipaddr_index('10') }} diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example index a2cdabbf3..3a70e5f83 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example @@ -31,6 +31,7 @@ parameters: opnfv_openstack_proxy_address: 172.30.10.103 opnfv_openstack_proxy_node01_address: 172.30.10.104 opnfv_openstack_proxy_node02_address: 172.30.10.105 + opnfv_openstack_proxy_control_address: 10.167.4.103 opnfv_openstack_proxy_node01_control_address: 10.167.4.104 opnfv_openstack_proxy_node02_control_address: 10.167.4.105 opnfv_openstack_control_address: 10.167.4.10 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml index 49140f803..7f8467051 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml @@ -22,6 +22,7 @@ parameters: openstack_gateway_node03_hostname: gtw03 # 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} @@ -198,7 +199,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-ocata-common-ha/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml index 98b3b4c81..2159522d1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml @@ -19,16 +19,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