u/fuel: Bump & rebase for virtual PDF support

Finally drop hardcoded IP addresses for virtual deploys from reclass,
but keep one small patch adjusting the local vPDF to achieve the same
goal.

JIRA: FUEL-322

Change-Id: I56a3b0487f564355a4c51b4eb71ec97e92531f1d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

14 files changed, 146 insertions, 212 deletions

diff --git a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch
index 3c4420f5..90e9f7cd 100644
--- a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch
+++ b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch
@@ -20,14 +20,14 @@ handle it via Salt for baremetal kvm* and cmp* nodes.
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml   | 1 +
- .../classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml   | 1 +
+ mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml         | 1 +
+ mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 1 +
  2 files changed, 2 insertions(+)
 
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
-index dcd78a2..a604d0a 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
+index 9f85366..3a6eb84 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
 @@ -7,6 +7,7 @@
  ##############################################################################
  ---
@@ -36,10 +36,10 @@ index dcd78a2..a604d0a 100644
    - system.linux.system.repo.glusterfs
    - service.keepalived.cluster.single
    - system.glusterfs.server.volume.glance
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml
-index 60a01a8..a2c6fa0 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
+index 2e79f80..8fe5c37 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
 @@ -7,6 +7,7 @@
  ##############################################################################
  ---
diff --git a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
index d80a832e..4c6218c7 100644
--- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
@@ -44,7 +44,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  create mode 100644 mcp/salt-formulas/armband/vgabios.sls
 
 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index 0bbf7cd..c49b27d 100755
+index 302de87..4a0c81c 100755
 --- a/mcp/config/states/openstack_ha
 +++ b/mcp/config/states/openstack_ha
 @@ -52,6 +52,7 @@ salt -I 'neutron:server' state.sls neutron -b 1
@@ -69,7 +69,7 @@ index 9fc30bb..998fc6b 100755
  salt -I 'horizon:server' file.symlink \
    /var/lib/openstack-dashboard/static \
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 338c447..009eeba 100755
+index 48e45d4..afdfb4f 100755
 --- a/mcp/config/states/virtual_control_plane
 +++ b/mcp/config/states/virtual_control_plane
 @@ -27,6 +27,7 @@ if [ "${ERASE_ENV}" -eq 1 ]; then
diff --git a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
deleted file mode 100644
index 02a079f0..00000000
--- a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 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: Tue, 18 Jul 2017 19:17:24 +0200
-Subject: [PATCH] network: public: Use arm-virtual2 POD config
-
-grep -e "10\.16\.0\." -R . -l | \
-  xargs sed -i \
-    -e 's/10\.16\.0\./10.0.9./g' \
-    -e 's/10\.0\.9\.254/10.0.9.200/g' \
-    -e 's/10\.0\.9\.1/10.0.9.254/g'
-
-NOTE: This should be converted into a dynamic configuration read from
-the universal POD descriptor in pharos, once that is ready.
-
-Until then, just align the public network configuration used by the
-virtual POD with the Enea lab configuration specific to arm-virtual2
-(i.e. public network on 10.0.9.0/24).
-
-NOTE: Replace the gateway at 10.16.0.1 (now 10.0.9.1) with the same
-IP address as our lab's gateway (10.0.9.254), to keep both possible
-network layouts in sync (using all virtual networks created via
-virsh, respectively our lab's static config).
-This will ensure deploys continue to work in both enviroments.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- mcp/config/states/networks                                        | 8 ++++----
- .../classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml | 4 ++--
- .../cluster/virtual-mcp-pike-common-noha/openstack_init.yml       | 2 +-
- .../classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml    | 2 +-
- .../cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml       | 2 +-
- .../classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml    | 2 +-
- mcp/scripts/net_public.xml                                        | 2 +-
- 7 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/mcp/config/states/networks b/mcp/config/states/networks
-index 222a072..9bbc0ce 100755
---- a/mcp/config/states/networks
-+++ b/mcp/config/states/networks
-@@ -17,10 +17,10 @@ POOL_START_IP=$(get_nova_compute_pillar_data 'opnfv_net_public_pool_start')
- POOL_END_IP=$(get_nova_compute_pillar_data 'opnfv_net_public_pool_end')
-
- # Default values
--PUBLIC_NET="${PUBLIC_NET:-10.16.0.0/24}"
--PUBLIC_NET_GATEWAY="${PUBLIC_NET_GATEWAY:-10.16.0.1}"
--POOL_START_IP="${POOL_START_IP:-10.16.0.130}"
--POOL_END_IP="${POOL_END_IP:-10.16.0.254}"
-+PUBLIC_NET="${PUBLIC_NET:-10.0.9.0/24}"
-+PUBLIC_NET_GATEWAY="${PUBLIC_NET_GATEWAY:-10.0.9.254}"
-+POOL_START_IP="${POOL_START_IP:-10.0.9.130}"
-+POOL_END_IP="${POOL_END_IP:-10.0.9.200}"
-
- # Print openstack status and setup network
- salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
-index 576925e..8530b10 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
-@@ -61,9 +61,9 @@ parameters:
-           params:
-             single_address: 172.16.10.105
-             tenant_address: 10.1.0.105
--            external_address: 10.16.0.105
-+            external_address: 10.0.9.105
-         openstack_compute_node02:
-           params:
-             single_address: 172.16.10.106
-             tenant_address: 10.1.0.106
--            external_address: 10.16.0.106
-+            external_address: 10.0.9.106
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
-index d5606b5..508d5e1 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
-@@ -14,7 +14,7 @@ parameters:
-     openstack_region: RegionOne
-     admin_email: root@localhost
-     cluster_public_protocol: http
--    cluster_public_host: 10.16.0.101
-+    cluster_public_host: 10.0.9.101
-     neutron_public_protocol: http
-     neutron_control_dvr: 'False'
-     neutron_l3_ha: 'False'
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
-index 8e38ff8..d7bf017 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
-@@ -24,4 +24,4 @@ parameters:
-         openstack_gateway_node01:
-           params:
-             tenant_address: 10.1.0.110
--            external_address: 10.16.0.110
-+            external_address: 10.0.9.110
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
-index abe13ef..ba3a6fc 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
-@@ -25,4 +25,4 @@ parameters:
-         openstack_gateway_node01:
-           params:
-             tenant_address: 10.1.0.110
--            external_address: 10.16.0.110
-+            external_address: 10.0.9.110
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
-index 66c2468..7326295 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
-@@ -17,4 +17,4 @@ parameters:
-         openstack_gateway_node01:
-           params:
-             tenant_address: 10.1.0.110
--            external_address: 10.16.0.110
-+            external_address: 10.0.9.110
-diff --git a/mcp/scripts/net_public.xml b/mcp/scripts/net_public.xml
-index d6df4aa..87f3146 100644
---- a/mcp/scripts/net_public.xml
-+++ b/mcp/scripts/net_public.xml
-@@ -10,5 +10,5 @@
-   <name>public</name>
-   <bridge name="public"/>
-   <forward mode="nat"/>
--  <ip address="10.16.0.1" netmask="255.255.255.0" />
-+  <ip address="10.0.9.254" netmask="255.255.255.0" />
- </network>
diff --git a/patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch b/patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch
new file mode 100644
index 00000000..f41b3763
--- /dev/null
+++ b/patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch
@@ -0,0 +1,65 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2018 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: Tue, 18 Jul 2017 19:17:24 +0200
+Subject: [PATCH] vPDF: Use arm-virtual2 POD config in sample
+
+NOTE: This will be obsoleted when arm-virtual2 vPDF+IDF lands upstream
+in Pharos git repo.
+
+Until then, just align the public network configuration used by the
+virtual POD with the Enea lab configuration specific to arm-virtual2
+(i.e. public network on 10.0.9.0/24).
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ mcp/config/labs/local/idf-virtual1.yaml | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/mcp/config/labs/local/idf-virtual1.yaml b/mcp/config/labs/local/idf-virtual1.yaml
+index 88437cd..31eaef7 100644
+--- a/mcp/config/labs/local/idf-virtual1.yaml
++++ b/mcp/config/labs/local/idf-virtual1.yaml
+@@ -41,9 +41,9 @@ idf:
+     public:
+       interface: 3  # when used, will be fourth vnet interface, untagged
+       vlan: native
+-      network: 10.16.0.0
++      network: 10.0.9.0
+       mask: 24
+-      gateway: 10.16.0.1
++      gateway: 10.0.9.254
+       dns:
+         - 8.8.8.8
+         - 8.8.4.4
+@@ -59,16 +59,16 @@ idf:
+         # Ordered-list, index should be in sync with node index in PDF
+         - interfaces: &interfaces
+             # Ordered-list, index should be in sync with interface index in PDF
+-            - 'ens3'
+-            - 'ens4'
+-            - 'ens5'
+-            - 'ens6'
++            - 'enp1s0'
++            - 'enp2s0'
++            - 'enp3s0'
++            - 'enp4s0'
+           busaddr: &busaddr
+             # Bus-info reported by `ethtool -i ethX`
+-            - '0000:00:03.0'
+-            - '0000:00:04.0'
+-            - '0000:00:05.0'
+-            - '0000:00:06.0'
++            - '0000:01:00.0'
++            - '0000:02:00.0'
++            - '0000:03:00.0'
++            - '0000:04:00.0'
+         - interfaces: *interfaces
+           busaddr: *busaddr
+         - interfaces: *interfaces
diff --git a/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
index 5af328ea..cbb6b264 100644
--- a/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
+++ b/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
@@ -33,7 +33,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
-index f953cdd..f966208 100644
+index e709313..a1ebf76 100644
 --- a/mcp/salt-formulas/opendaylight/server.sls
 +++ b/mcp/salt-formulas/opendaylight/server.sls
 @@ -91,4 +91,9 @@ opendaylight:
diff --git a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
index 85ee6b56..13f31310 100644
--- a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
+++ b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
@@ -18,7 +18,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
  ...-Add-curtin_userdata_arm64_generic_xenial.patch | 35 +++++++++++++++++++++
  mcp/patches/patches.list                           |  1 +
- .../baremetal-mcp-pike-common-ha/infra/maas.yml    | 36 ++++++++++++++++++++++
+ .../cluster/mcp-pike-common-ha/infra/maas.yml      | 36 ++++++++++++++++++++++
  .../files/curtin_userdata_arm64_generic_xenial     | 35 +++++++++++++++++++++
  4 files changed, 107 insertions(+)
  create mode 100644 mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
@@ -66,19 +66,19 @@ index 0000000..0368937
 +   file.managed:
 +   - source: salt://maas/files/pgpass
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 34d913a..01e3224 100644
+index 703bd05..e7c6456 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -18,3 +18,4 @@
- /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch
+@@ -19,3 +19,4 @@
+ /usr/share/salt-formulas/env: 0011-routes-Skip-network-restart-on-noifupdown.patch
  /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
  /usr/share/salt-formulas/env: 0013-dpdk-Support-ovs-bridge-tagging.patch
 +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
-index 3bf87dc..4954559 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
-@@ -40,6 +40,42 @@ parameters:
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
+index 3dc9998..956ab4b 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
+@@ -41,6 +41,42 @@ parameters:
          enable_third_party_drivers: true
          network_discovery: 'enabled'
          default_min_hwe_kernel: ${_param:hwe_kernel}
diff --git a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 5c005f09..fb46caaa 100644
--- a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
@@ -41,7 +41,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  create mode 100644 mcp/salt-formulas/armband/salt_minion.sls
 
 diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index cd254dd..fb20a81 100755
+index c147728..6d7c0b4 100755
 --- a/mcp/config/states/baremetal_init
 +++ b/mcp/config/states/baremetal_init
 @@ -32,6 +32,7 @@ salt -C 'cmp*' state.apply linux.network || true
diff --git a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
index d28cb61b..927ff0e0 100644
--- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -26,8 +26,8 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  .../0103-virtng-module-Extend-libvirt_domain.patch | 54 ++++++++++++++++++++++
  ...4-salt-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++++
  mcp/patches/patches.list                           |  2 +
- .../baremetal-mcp-pike-common-ha/infra/kvm.yml     | 15 ++++++
- .../baremetal-mcp-pike-odl-ha/infra/kvm.yml        |  3 ++
+ .../cluster/mcp-pike-common-ha/infra/kvm.yml       | 15 ++++++
+ .../classes/cluster/mcp-pike-odl-ha/infra/kvm.yml  |  3 ++
  5 files changed, 125 insertions(+)
  create mode 100644 mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch
  create mode 100644 mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch
@@ -150,20 +150,20 @@ index 0000000..78eb0bf
 +
 + #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 01e3224..e17a329 100644
+index e7c6456..f68cf70 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -19,3 +19,5 @@
+@@ -20,3 +20,5 @@
  /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
  /usr/share/salt-formulas/env: 0013-dpdk-Support-ovs-bridge-tagging.patch
  /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
 +/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
 +/usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
-index a604d0a..166b368 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
-@@ -50,21 +50,33 @@ parameters:
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
+index 3a6eb84..382b7a2 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
+@@ -52,21 +52,33 @@ parameters:
          openstack.control:
            cpu: 4
            ram: 12288
@@ -197,7 +197,7 @@ index a604d0a..166b368 100644
            disk_profile: xxlarge
            net_profile: default
          # stacklight.log:
-@@ -85,6 +97,9 @@ parameters:
+@@ -87,6 +99,9 @@ parameters:
          openstack.proxy:
            cpu: 2
            ram: 2048
@@ -207,10 +207,10 @@ index a604d0a..166b368 100644
            disk_profile: small
            net_profile: default_ext
        cluster:
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml
-index bbc80e2..8efebc7 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml
+index 536963c..8c61538 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml
 @@ -17,6 +17,9 @@ parameters:
          opendaylight.server:
            cpu: 4
diff --git a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
index c504ca2f..9764307e 100644
--- a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
+++ b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
@@ -49,10 +49,10 @@ index 0000000..d40e63b
 +     cmd += 'else sh {0} -c /tmp {1}; fi'.format(
 +         os.path.join(tmppath, 'bootstrap-salt.sh'), arg)
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index e17a329..d066305 100644
+index f68cf70..df68fc8 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -21,3 +21,4 @@
+@@ -22,3 +22,4 @@
  /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
  /usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
  /usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch
diff --git a/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch
index 4aa8d570..23dd9e27 100644
--- a/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch
+++ b/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch
@@ -16,13 +16,13 @@ Those instructions need to be overwritten for ARM.
 Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
 Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
 ---
- .../cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml        | 4 ++--
+ mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml
-index a2c6fa0..9e8ad09 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
+index 8fe5c37..36d6b05 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
 @@ -12,8 +12,8 @@ classes:
    - system.linux.storage.loopback
    - system.glusterfs.client.cluster
diff --git a/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
index 356cc8ba..ce7e56e6 100644
--- a/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
+++ b/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
@@ -14,14 +14,14 @@ JIRA: https://jira.opnfv.org/browse/ARMBAND-304
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- .../classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml     | 2 +-
- .../classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml     | 2 +-
+ mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml   | 2 +-
+ mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-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
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml
 index 8f4edef..6a75099 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
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml
 @@ -190,7 +190,7 @@ parameters:
        repo:
          uca:
@@ -31,11 +31,11 @@ index 8f4edef..6a75099 100644
            key_id: EC4926EA
            key_server: keyserver.ubuntu.com
        kernel:
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
-index 508d5e1..0ef0d4b 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
-@@ -98,7 +98,7 @@ parameters:
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
+index d6ec205..c01ccfb 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
+@@ -96,7 +96,7 @@ parameters:
        repo:
          uca:
            source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
diff --git a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch
index 0d24d07b..2129d2a7 100644
--- a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch
@@ -22,7 +22,7 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
  create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
 
 diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index fb20a81..a174640 100755
+index 6d7c0b4..a7043d9 100755
 --- a/mcp/config/states/baremetal_init
 +++ b/mcp/config/states/baremetal_init
 @@ -23,6 +23,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
@@ -30,16 +30,16 @@ index fb20a81..a174640 100755
 
  salt -C 'kvm*' pkg.install bridge-utils
 +salt -C 'kvm* or cmp*' state.apply opnfv.adduser
- salt -C 'kvm*' state.apply linux.network
+ salt -C 'kvm*' state.apply linux.network,linux.system.kernel
  salt -C 'kvm* or cmp*' state.apply salt.minion
  salt -C 'cmp*' state.apply linux.system
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 009eeba..9349e7e 100755
+index afdfb4f..0c0d69c 100755
 --- a/mcp/config/states/virtual_control_plane
 +++ b/mcp/config/states/virtual_control_plane
-@@ -49,6 +49,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
-   ((attempt+=1))
- done
+@@ -39,6 +39,7 @@ vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:no
+ # Check all vcp nodes are available
+ wait_for 25.0 "(for n in ${vcp_nodes}; do salt \${n} test.ping 2>/dev/null || exit; done)"
 
 +wait_for 5.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply opnfv.adduser"
  wait_for 10.0 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
diff --git a/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch b/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch
index 86f02519..04f9d9c4 100644
--- a/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch
+++ b/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch
@@ -15,15 +15,15 @@ so stick to 3.12 for now.
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml  | 2 +-
- .../classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml  | 2 +-
- .../classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml  | 2 +-
+ mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml         | 2 +-
+ mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 2 +-
+ mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
-index 166b368..0c7f0c3 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
+index 382b7a2..af9afb6 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
 @@ -27,7 +27,7 @@ classes:
  parameters:
    _param:
@@ -33,10 +33,10 @@ index 166b368..0c7f0c3 100644
      cluster_vip_address: ${_param:infra_kvm_address}
      cluster_node01_address: ${_param:infra_kvm_node01_address}
      cluster_node02_address: ${_param:infra_kvm_node02_address}
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml
-index 9e8ad09..ddff3db 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
+index 36d6b05..482566b 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
 @@ -36,7 +36,7 @@ parameters:
      keepalived_vip_virtual_router_id: 69
      loopback_device_size: 20
@@ -46,10 +46,10 @@ index 9e8ad09..ddff3db 100644
    glusterfs:
      client:
        volumes:
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml
 index cf09a41..0b6256f 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml
 @@ -38,7 +38,7 @@ parameters:
      cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
      cluster_node03_address: ${_param:openstack_control_node03_address}
diff --git a/patches/opnfv-fuel/0014-Revert-Get-back-to-the-GA-kernel.patch b/patches/opnfv-fuel/0014-Revert-Get-back-to-the-GA-kernel.patch
index cda9f2ae..2ac84ca8 100644
--- a/patches/opnfv-fuel/0014-Revert-Get-back-to-the-GA-kernel.patch
+++ b/patches/opnfv-fuel/0014-Revert-Get-back-to-the-GA-kernel.patch
@@ -12,18 +12,18 @@ Subject: [PATCH] Revert "Get back to the GA kernel"
 
 This reverts commit d06bcfb72c44b507c3efee4de00f415869f48450.
 ---
- mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml | 2 +-
+ mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
-index 4954559..d5528e3 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
-@@ -24,7 +24,7 @@ parameters:
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
+index 956ab4b..d0e5961 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
+@@ -25,7 +25,7 @@ parameters:
      maas_db_password: opnfv_secret
      dns_server01: ${_param:opnfv_dns_server01}
      single_address: ${_param:infra_maas_node01_deploy_address}
--    hwe_kernel: 'ga-16.04'
+-    hwe_kernel: 'hwe-16.04'
 +    hwe_kernel: 'hwe-16.04-edge'
    maas:
      region: