From 35041f05e790f8c13782eb4956b991a97fdec853 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 13 Nov 2017 21:12:30 +0100 Subject: [baremetal] Re-assign mgmt network to proxy nodes - extend arch-specific list of predefined VM iface names (2 -> 3); - add extra vnet iface for prx0* VCP VMs, connected to br-ctl (mgmt); - add mgmt address to pod_config.yml template (and sample); - add mgmt address to reclass.storage prx nodes; JIRA: FUEL-302 Change-Id: I17ce65eade7f69219fc27264363364e3c47d8f3f Signed-off-by: Alexandru Avadanii --- ...001-Add-IDF-mappings-to-installer-adapter.patch | 2 +- ...-IPMI-Trim-netmask-from-IP-passed-to-MaaS.patch | 2 +- ...4-Use-PXE-interface-index-from-net_config.patch | 2 +- ...005-Re-assign-mgmt-network-to-proxy-nodes.patch | 30 ++++++++++++++++++++++ 4 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 mcp/patches/pharos/0005-Re-assign-mgmt-network-to-proxy-nodes.patch (limited to 'mcp/patches') diff --git a/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch b/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch index 383b702f3..30b52af9d 100644 --- a/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch +++ b/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch @@ -16,7 +16,7 @@ Signed-off-by: Alexandru Avadanii 1 file changed, 7 insertions(+) diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 -index 99434f9..676ead3 100644 +index c2f1403..19e5d0d 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -26,6 +26,13 @@ diff --git a/mcp/patches/pharos/0003-IPMI-Trim-netmask-from-IP-passed-to-MaaS.patch b/mcp/patches/pharos/0003-IPMI-Trim-netmask-from-IP-passed-to-MaaS.patch index 0293b6e7a..2684eda4c 100644 --- a/mcp/patches/pharos/0003-IPMI-Trim-netmask-from-IP-passed-to-MaaS.patch +++ b/mcp/patches/pharos/0003-IPMI-Trim-netmask-from-IP-passed-to-MaaS.patch @@ -17,7 +17,7 @@ Signed-off-by: Alexandru Avadanii 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 -index 676ead3..36bbd96 100644 +index 19e5d0d..890b380 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -90,35 +90,35 @@ parameters: diff --git a/mcp/patches/pharos/0004-Use-PXE-interface-index-from-net_config.patch b/mcp/patches/pharos/0004-Use-PXE-interface-index-from-net_config.patch index d08bfe33a..b0529a825 100644 --- a/mcp/patches/pharos/0004-Use-PXE-interface-index-from-net_config.patch +++ b/mcp/patches/pharos/0004-Use-PXE-interface-index-from-net_config.patch @@ -20,7 +20,7 @@ Signed-off-by: Alexandru Avadanii 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 -index 36bbd96..ca37f92 100644 +index 890b380..abded17 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -8,6 +8,7 @@ diff --git a/mcp/patches/pharos/0005-Re-assign-mgmt-network-to-proxy-nodes.patch b/mcp/patches/pharos/0005-Re-assign-mgmt-network-to-proxy-nodes.patch new file mode 100644 index 000000000..fe7c3c79c --- /dev/null +++ b/mcp/patches/pharos/0005-Re-assign-mgmt-network-to-proxy-nodes.patch @@ -0,0 +1,30 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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, 13 Nov 2017 21:09:33 +0100 +Subject: [PATCH] Re-assign mgmt network to proxy nodes + +Signed-off-by: Alexandru Avadanii +--- + config/installers/fuel/pod_config.yml.j2 | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 +index abded17..bd815d5 100644 +--- a/config/installers/fuel/pod_config.yml.j2 ++++ b/config/installers/fuel/pod_config.yml.j2 +@@ -50,6 +50,8 @@ parameters: + opnfv_openstack_gateway_node01_tenant_address: {{ net_private | ipaddr_index('6') }} + opnfv_openstack_gateway_node02_tenant_address: {{ net_private | ipaddr_index('7') }} + opnfv_openstack_gateway_node03_tenant_address: {{ net_private | ipaddr_index('9') }} ++ opnfv_openstack_proxy_node01_control_address: {{ net_mgmt | ipaddr_index('81') }} ++ opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | ipaddr_index('82') }} + 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') }} -- cgit 1.2.3-korg