From 29c64b73f749364867be78a474410fe062eba99e 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 --- ...002-Add-proxy-node-management-network-VIP.patch | 29 ++++++++++++++++++ ...0003-Use-keystone-v3-endpoints-by-default.patch | 34 ++++++++++++++++++++++ ...0004-Use-keystone-v3-endpoints-by-default.patch | 31 -------------------- .../opnfv/pod_config.yml.example | 1 + .../openstack_init.yml | 3 +- .../openstack_proxy.yml | 8 +++-- 6 files changed, 72 insertions(+), 34 deletions(-) create mode 100644 mcp/patches/pharos/0002-Add-proxy-node-management-network-VIP.patch create mode 100644 mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch delete mode 100644 mcp/patches/reclass-system-salt-model/0004-Use-keystone-v3-endpoints-by-default.patch (limited to 'mcp') 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/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch b/mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch new file mode 100644 index 000000000..6f860bcce --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch @@ -0,0 +1,34 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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: Michael Polenchuk +Date: Thu, 28 Dec 2017 12:49:33 +0400 +Subject: [PATCH] Use keystone v3 endpoints by default + +The v2.0 auth API has been already marked as deprecated in the +Mitaka release and will be removed in the "T" release. +The v3 API should be used instead. + +Change-Id: I7e9a1b180f4e0ddb24ec72ed9f08c9e2580c7897 +--- + keystone/client/single.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/keystone/client/single.yml b/keystone/client/single.yml +index ebf5b5f..8007710 100644 +--- a/keystone/client/single.yml ++++ b/keystone/client/single.yml +@@ -4,7 +4,7 @@ classes: + - system.keystone.client.service.glance + - system.keystone.client.service.heat + - system.keystone.client.service.heat-cfn +-- system.keystone.client.service.keystone ++- system.keystone.client.service.keystone3 + - system.keystone.client.service.neutron + parameters: + linux: diff --git a/mcp/patches/reclass-system-salt-model/0004-Use-keystone-v3-endpoints-by-default.patch b/mcp/patches/reclass-system-salt-model/0004-Use-keystone-v3-endpoints-by-default.patch deleted file mode 100644 index 73fafdb3f..000000000 --- a/mcp/patches/reclass-system-salt-model/0004-Use-keystone-v3-endpoints-by-default.patch +++ /dev/null @@ -1,31 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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: Michael Polenchuk -Date: Thu, 28 Dec 2017 12:49:33 +0400 -Subject: [PATCH] Use keystone v3 endpoints by default - -The v2.0 auth API has been already marked as deprecated in the -Mitaka release and will be removed in the "T" release. -The v3 API should be used instead. - -Change-Id: I7e9a1b180f4e0ddb24ec72ed9f08c9e2580c7897 - -diff --git a/keystone/client/single.yml b/keystone/client/single.yml -index ebf5b5ff..80077105 100644 ---- a/keystone/client/single.yml -+++ b/keystone/client/single.yml -@@ -4,7 +4,7 @@ classes: - - system.keystone.client.service.glance - - system.keystone.client.service.heat - - system.keystone.client.service.heat-cfn --- system.keystone.client.service.keystone -+- system.keystone.client.service.keystone3 - - system.keystone.client.service.neutron - parameters: - linux: diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example index a2cdabbf3..3a70e5f83 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example +++ b/mcp/reclass/classes/cluster/all-mcp-arch-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-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