[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 <Alexandru.Avadanii@enea.com>
(cherry picked from commit 35041f05e790f8c13782eb4956b991a97fdec853)

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 383b702..30b52af 100644 (file)
--- 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 <Alexandru.Avadanii@enea.com>
  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 0293b6e..2684eda 100644 (file)
--- 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 <Alexandru.Avadanii@enea.com>
  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 d08bfe3..b0529a8 100644 (file)
--- 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 <Alexandru.Avadanii@enea.com>
  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 (file)
index 0000000..fe7c3c7
--- /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 <Alexandru.Avadanii@enea.com>
+Date: Mon, 13 Nov 2017 21:09:33 +0100
+Subject: [PATCH] Re-assign mgmt network to proxy nodes
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ 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') }}

diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
index c698bba..b5b78ec 100644 (file)
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
@@ -16,7 +16,8 @@ parameters:
     opnfv_fn_vm_tertiary_interface: enp3s0
     opnfv_fn_vm_quaternary_interface: enp4s0
 
-    # VCP VMs spawned on KVM Hosts net ifaces (max 2)
+    # VCP VMs spawned on KVM Hosts net ifaces (max 3)
     # NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ
     opnfv_vcp_vm_primary_interface: ${_param:opnfv_fn_vm_primary_interface}
     opnfv_vcp_vm_secondary_interface: ${_param:opnfv_fn_vm_secondary_interface}
+    opnfv_vcp_vm_tertiary_interface: ${_param:opnfv_fn_vm_tertiary_interface}

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 c85a226..d787628 100644 (file)
--- 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
@@ -26,9 +26,11 @@ parameters:
     opnfv_openstack_gateway_node01_tenant_address: 10.1.0.6
     opnfv_openstack_gateway_node02_tenant_address: 10.1.0.7
     opnfv_openstack_gateway_node03_tenant_address: 10.1.0.9
-    opnfv_openstack_proxy_address: 10.167.4.80
-    opnfv_openstack_proxy_node01_address: 10.167.4.81
-    opnfv_openstack_proxy_node02_address: 10.167.4.82
+    opnfv_openstack_proxy_node01_control_address: 10.167.4.81
+    opnfv_openstack_proxy_node02_control_address: 10.167.4.82
+    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_control_address: 10.167.4.10
     opnfv_openstack_control_node01_address: 10.167.4.11
     opnfv_openstack_control_node02_address: 10.167.4.12

diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
index 13cbbb9..867ccb7 100644 (file)
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
@@ -16,7 +16,8 @@ parameters:
     opnfv_fn_vm_tertiary_interface: ens5
     opnfv_fn_vm_quaternary_interface: ens6
 
-    # VCP VMs spawned on KVM Hosts net ifaces (max 2)
+    # VCP VMs spawned on KVM Hosts net ifaces (max 3)
     # NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ
     opnfv_vcp_vm_primary_interface: ens2
     opnfv_vcp_vm_secondary_interface: ens3
+    opnfv_vcp_vm_tertiary_interface: ens4

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
index a96e254..3d3f8df 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
@@ -65,6 +65,15 @@ parameters:
 
     # yamllint disable-line rule:line-length
     salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
+  reclass:
+    storage:
+      node:
+        openstack_proxy_node01:
+          params:
+            control_address: ${_param:openstack_proxy_node01_control_address}
+        openstack_proxy_node02:
+          params:
+            control_address: ${_param:openstack_proxy_node02_control_address}
   linux:
     system:
       user:

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
index d098fa6..004f72a 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
@@ -121,12 +121,15 @@ parameters:
           bridge: br-ctl
           model: virtio
       default_ext:
-        eth1:
+        eth2:
           bridge: br-mgmt
           model: virtio
-        eth0:
+        eth1:
           bridge: br-ex
           model: virtio
+        eth0:
+          bridge: br-ctl
+          model: virtio
   glusterfs:
     server:
       volumes:

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml
index e638bca..49140f8 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml
@@ -22,6 +22,8 @@ parameters:
     openstack_gateway_node03_hostname: gtw03
 
     # openstack service addresses
+    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}
     openstack_proxy_node01_address: ${_param:opnfv_openstack_proxy_node01_address}
     openstack_proxy_node02_address: ${_param:opnfv_openstack_proxy_node02_address}
@@ -201,12 +203,12 @@ parameters:
             - ${_param:openstack_proxy_hostname}
             - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
         prx01:
-          address: ${_param:openstack_proxy_node01_address}
+          address: ${_param:openstack_proxy_node01_control_address}
           names:
             - ${_param:openstack_proxy_node01_hostname}
             - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
         prx02:
-          address: ${_param:openstack_proxy_node02_address}
+          address: ${_param:openstack_proxy_node02_control_address}
           names:
             - ${_param:openstack_proxy_node02_hostname}
             - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain}

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
index a2d3985..1d0e8d1 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
@@ -33,11 +33,19 @@ parameters:
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
     dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
     single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
+    control_nic: ${_param:opnfv_vcp_vm_tertiary_interface}
   linux:
     network:
       interface:
         dhcp: ${_param:linux_dhcp_interface}
         single: ${_param:linux_single_interface}
+        control:
+          enabled: true
+          type: eth
+          proto: static
+          name: ${_param:control_nic}
+          address: ${_param:control_address}
+          netmask: 255.255.255.0
     system:
       package:
         libapache2-mod-wsgi: