u/fuel: Bump & rebase for common reclass rework

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

15 files changed, 95 insertions, 385 deletions

diff --git a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
index b211e50e..c09d21a7 100644
--- a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
@@ -48,20 +48,20 @@ 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 b/mcp/config/states/openstack
-index beb6abb..885f2ac 100755
+index 9683103..624b08e 100755
 --- a/mcp/config/states/openstack
 +++ b/mcp/config/states/openstack
-@@ -35,3 +35,5 @@ salt -I 'ceilometer:server' state.sls ceilometer
+@@ -41,3 +41,5 @@ salt -I 'ceilometer:server' state.sls ceilometer
  salt -I 'ceilometer:agent' state.sls ceilometer
 
  salt -I 'horizon:server' state.sls horizon
 +
 +salt -I 'nova:compute' state.sls armband
 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index c4c513d..9084678 100755
+index 230288f..921b216 100755
 --- a/mcp/config/states/openstack_ha
 +++ b/mcp/config/states/openstack_ha
-@@ -44,6 +44,7 @@ salt -I 'neutron:server' state.sls neutron -b 1
+@@ -50,6 +50,7 @@ salt -I 'neutron:server' state.sls neutron -b 1
  salt -I 'neutron:gateway' state.sls neutron.gateway
 
  salt -I 'nova:compute' state.sls nova
@@ -70,10 +70,10 @@ index c4c513d..9084678 100755
  salt -I 'mongodb:server' state.sls mongodb
  wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 645009b..79ad880 100755
+index 58ae335..c645ffd 100755
 --- a/mcp/config/states/virtual_control_plane
 +++ b/mcp/config/states/virtual_control_plane
-@@ -12,6 +12,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected
+@@ -18,6 +18,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected
 
  salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
 
diff --git a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch
index 0e151af3..59ec3117 100644
--- a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch
+++ b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch
@@ -41,10 +41,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  4 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/mcp/config/states/networks b/mcp/config/states/networks
-index 505153a..bd6e923 100755
+index 361e675..e49401c 100755
 --- a/mcp/config/states/networks
 +++ b/mcp/config/states/networks
-@@ -10,7 +10,7 @@ PUBLIC_NET=$(salt --out yaml 'cmp*' pillar.get _param:external_address | \
+@@ -16,7 +16,7 @@ PUBLIC_NET=$(salt --out yaml 'cmp*' pillar.get _param:external_address | \
    pillar.get _param:openstack_compute_node01_external_address | \
    awk --re-interval '/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/{print $2; exit}')
 
@@ -53,7 +53,7 @@ index 505153a..bd6e923 100755
 
  salt 'ctl01*' cmd.run ". /root/keystonercv3; \
    openstack compute service list; \
-@@ -21,6 +21,6 @@ salt 'ctl01*' cmd.run ". /root/keystonercv3; \
+@@ -27,6 +27,6 @@ salt 'ctl01*' cmd.run ". /root/keystonercv3; \
    openstack network create --external --default --provider-network-type flat \
      --provider-physical-network physnet1 floating_net"
  salt 'ctl01*' cmd.run ". /root/keystonercv3; \
@@ -63,10 +63,10 @@ index 505153a..bd6e923 100755
 +    --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.200 \
      --network floating_net --subnet-range ${PUBLIC_NET} floating_subnet"
 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
-index 07fada6..fe0714d 100644
+index 3c3d526..e114ec2 100644
 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
-@@ -54,13 +54,13 @@ parameters:
+@@ -61,13 +61,13 @@ parameters:
            params:
              single_address: 172.16.10.105
              tenant_address: 10.1.0.105
@@ -84,10 +84,10 @@ index 07fada6..fe0714d 100644
 -            external_address: 10.16.0.110
 +            external_address: 10.0.9.110
 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
-index 8ac2391..bdedfcb 100644
+index 4f1c557..3784b7e 100644
 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
-@@ -7,7 +7,7 @@ parameters:
+@@ -14,7 +14,7 @@ parameters:
      openstack_region: RegionOne
      admin_email: root@localhost
      cluster_public_protocol: http
@@ -97,10 +97,10 @@ index 8ac2391..bdedfcb 100644
      neutron_control_dvr: 'False'
      neutron_l3_ha: 'False'
 diff --git a/mcp/scripts/net_public.xml b/mcp/scripts/net_public.xml
-index 61650d5..f455480 100644
+index d6df4aa..87f3146 100644
 --- a/mcp/scripts/net_public.xml
 +++ b/mcp/scripts/net_public.xml
-@@ -2,5 +2,5 @@
+@@ -10,5 +10,5 @@
    <name>public</name>
    <bridge name="public"/>
    <forward mode="nat"/>
diff --git a/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
index 4d53b63d..af8e35ef 100644
--- a/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
+++ b/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
@@ -33,10 +33,10 @@ 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 f7a9741..adb9e8a 100644
+index 5de4eee..4bf81a9 100644
 --- a/mcp/salt-formulas/opendaylight/server.sls
 +++ b/mcp/salt-formulas/opendaylight/server.sls
-@@ -65,4 +65,9 @@ opendaylight:
+@@ -72,4 +72,9 @@ opendaylight:
        - service: opendaylight
  {%- endif %}
 
diff --git a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch
index 6088e764..4882446d 100644
--- a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch
+++ b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch
@@ -17,19 +17,15 @@ AArch64 NIC adaptation for dual NIC boards with traffic separation
 Change-Id: Iae73670c7ec6080f420cf61e5f0a79f8424665c9
 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
 ---
- .../cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml      | 12 +++++++++---
- .../baremetal-mcp-ocata-odl-ha/openstack/compute.yml      | 15 ++++-----------
- .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml | 12 +++++++++---
- .../baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml | 13 +++----------
- .../cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml      | 12 +++++++++---
- .../baremetal-mcp-ocata-ovs-ha/openstack/compute.yml      | 15 ++++-----------
- 6 files changed, 38 insertions(+), 41 deletions(-)
+ .../cluster/baremetal-mcp-ocata-common/infra/kvm.yml      | 12 +++++++++---
+ .../baremetal-mcp-ocata-common/openstack_compute.yml      | 15 ++++-----------
+ 2 files changed, 13 insertions(+), 14 deletions(-)
 
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
-index c9b3bc1..b8b5208 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
-@@ -26,6 +26,7 @@ parameters:
+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 ce81f42..b270e0f 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
+@@ -32,6 +32,7 @@ parameters:
      keepalived_vip_interface: br-ctl
      keepalived_vip_virtual_router_id: 69
      deploy_nic: ${_param:opnfv_baremetal_primary_nic}
@@ -37,7 +33,7 @@ index c9b3bc1..b8b5208 100644
    salt:
      control:
        size:  # RAM 4096,8192,16384,32768,65536
-@@ -148,6 +149,11 @@ parameters:
+@@ -144,6 +145,11 @@ parameters:
            netmask: 255.255.255.0
            name: ${_param:deploy_nic}
            noifupdown: true
@@ -49,7 +45,7 @@ index c9b3bc1..b8b5208 100644
          br-mgmt:
            enabled: true
            proto: dhcp
-@@ -160,9 +166,9 @@ parameters:
+@@ -156,9 +162,9 @@ parameters:
            enabled: true
            proto: manual
            type: vlan
@@ -61,113 +57,17 @@ index c9b3bc1..b8b5208 100644
          br-ctl:
            enabled: true
            type: bridge
-@@ -170,4 +176,4 @@ parameters:
+@@ -166,4 +172,4 @@ parameters:
            address: ${_param:single_address}
            netmask: 255.255.255.0
            use_interfaces:
 -            - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
 +            - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-index 032dd84..e898353 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-@@ -26,7 +26,6 @@ parameters:
-     nova_vncproxy_url: https://${_param:cluster_public_host}:6080
-     mgmt_nic: ${_param:opnfv_baremetal_primary_nic}
-     tenant_nic: ${_param:opnfv_baremetal_secondary_nic}
--    external_nic: ${_param:opnfv_baremetal_tertiary_nic}
-     interface_mtu: 1500
-     keepalived_vip_interface: br-ctl
-     keepalived_vip_virtual_router_id: 69
-@@ -77,12 +76,6 @@ parameters:
-           type: eth
-           proto: manual
-           name: ${_param:tenant_nic}
--        external_nic:
--          enabled: true
--          name: ${_param:external_nic}
--          mtu: ${_param:interface_mtu}
--          proto: manual
--          type: eth
-         br-mesh:
-           enabled: true
-           type: bridge
-@@ -95,9 +88,9 @@ parameters:
-           enabled: true
-           proto: manual
-           type: vlan
--          name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
-+          name: ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
-           use_interfaces:
--            - ${_param:mgmt_nic}
-+            - ${_param:tenant_nic}
-         tenant-vlan:
-           enabled: true
-           proto: manual
-@@ -112,7 +105,7 @@ parameters:
-           address: ${_param:single_address}
-           netmask: 255.255.255.0
-           use_interfaces:
--            - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
-+            - ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
-         br-floating:
-           enabled: true
-           type: ovs_bridge
-@@ -129,6 +122,6 @@ parameters:
-           address: ${_param:external_address}
-           netmask: 255.255.255.0
-           use_interfaces:
--            - ${_param:external_nic}
-+            - ${_param:tenant_nic}
-           use_ovs_ports:
-             - float-to-ex
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
-index d5f2e92..725c2c0 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
-@@ -26,6 +26,7 @@ parameters:
-     keepalived_vip_interface: br-ctl
-     keepalived_vip_virtual_router_id: 69
-     deploy_nic: ${_param:opnfv_baremetal_primary_nic}
-+    trunk_nic: ${_param:opnfv_baremetal_secondary_nic}
-   salt:
-     control:
-       size:  # RAM 4096,8192,16384,32768,65536
-@@ -137,6 +138,11 @@ parameters:
-           netmask: 255.255.255.0
-           name: ${_param:deploy_nic}
-           noifupdown: true
-+        trunk:
-+          enabled: true
-+          type: eth
-+          proto: manual
-+          name: ${_param:trunk_nic}
-         br-mgmt:
-           enabled: true
-           proto: dhcp
-@@ -149,9 +155,9 @@ parameters:
-           enabled: true
-           proto: manual
-           type: vlan
--          name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
-+          name: ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
-           use_interfaces:
--            - ${_param:deploy_nic}
-+            - ${_param:trunk_nic}
-         br-ctl:
-           enabled: true
-           type: bridge
-@@ -159,4 +165,4 @@ parameters:
-           address: ${_param:single_address}
-           netmask: 255.255.255.0
-           use_interfaces:
--            - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
-+            - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
-index e8fc087..13d45f7 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
-@@ -25,7 +25,6 @@ parameters:
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
+index aca416e..07561cd 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
+@@ -30,7 +30,6 @@ parameters:
      cluster_node03_address: ${_param:openstack_control_node03_address}
      nova_vncproxy_url: https://${_param:cluster_public_host}:6080
      mgmt_nic: ${_param:opnfv_baremetal_primary_nic}
@@ -175,7 +75,7 @@ index e8fc087..13d45f7 100644
      interface_mtu: 1500
      keepalived_vip_interface: br-ctl
      keepalived_vip_virtual_router_id: 69
-@@ -71,19 +70,13 @@ parameters:
+@@ -60,19 +59,13 @@ parameters:
            type: eth
            proto: dhcp
            name: ${_param:mgmt_nic}
@@ -197,95 +97,7 @@ index e8fc087..13d45f7 100644
          br-ctl:
            enabled: true
            type: bridge
-@@ -91,7 +84,7 @@ parameters:
-           address: ${_param:single_address}
-           netmask: 255.255.255.0
-           use_interfaces:
--            - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
-+            - ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
-         br-floating:
-           enabled: true
-           type: ovs_bridge
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
-index eb73e1c..730de08 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
-@@ -26,6 +26,7 @@ parameters:
-     keepalived_vip_interface: br-ctl
-     keepalived_vip_virtual_router_id: 69
-     deploy_nic: ${_param:opnfv_baremetal_primary_nic}
-+    trunk_nic: ${_param:opnfv_baremetal_secondary_nic}
-   salt:
-     control:
-       size:  # RAM 4096,8192,16384,32768,65536
-@@ -138,6 +139,11 @@ parameters:
-           netmask: 255.255.255.0
-           name: ${_param:deploy_nic}
-           noifupdown: true
-+        trunk:
-+          enabled: true
-+          type: eth
-+          proto: manual
-+          name: ${_param:trunk_nic}
-         br-mgmt:
-           enabled: true
-           proto: dhcp
-@@ -150,9 +156,9 @@ parameters:
-           enabled: true
-           proto: manual
-           type: vlan
--          name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
-+          name: ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
-           use_interfaces:
--            - ${_param:deploy_nic}
-+            - ${_param:trunk_nic}
-         br-ctl:
-           enabled: true
-           type: bridge
-@@ -160,4 +166,4 @@ parameters:
-           address: ${_param:single_address}
-           netmask: 255.255.255.0
-           use_interfaces:
--            - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
-+            - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
-index 165e0c9..cad293d 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
-@@ -25,7 +25,6 @@ parameters:
-     nova_vncproxy_url: https://${_param:cluster_public_host}:6080
-     mgmt_nic: ${_param:opnfv_baremetal_primary_nic}
-     tenant_nic: ${_param:opnfv_baremetal_secondary_nic}
--    external_nic: ${_param:opnfv_baremetal_tertiary_nic}
-     linux_system_codename: xenial
-     interface_mtu: 1500
-     keepalived_vip_interface: br-ctl
-@@ -60,12 +59,6 @@ parameters:
-           type: eth
-           proto: manual
-           name: ${_param:tenant_nic}
--        external_nic:
--          enabled: true
--          name: ${_param:external_nic}
--          mtu: ${_param:interface_mtu}
--          proto: manual
--          type: eth
-         br-mesh:
-           enabled: true
-           type: bridge
-@@ -78,9 +71,9 @@ parameters:
-           enabled: true
-           proto: manual
-           type: vlan
--          name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
-+          name: ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
-           use_interfaces:
--            - ${_param:mgmt_nic}
-+            - ${_param:tenant_nic}
-         tenant-vlan:
-           enabled: true
-           proto: manual
-@@ -95,7 +88,7 @@ parameters:
+@@ -80,7 +73,7 @@ parameters:
            address: ${_param:single_address}
            netmask: 255.255.255.0
            use_interfaces:
@@ -294,7 +106,7 @@ index 165e0c9..cad293d 100644
          br-floating:
            enabled: true
            type: ovs_bridge
-@@ -112,6 +105,6 @@ parameters:
+@@ -97,6 +90,6 @@ parameters:
            address: ${_param:external_address}
            netmask: 255.255.255.0
            use_interfaces:
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 4aebeaff..3c5a6ea9 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
@@ -102,10 +102,10 @@ index 0000000..b969e07
 ++{{endif}}
 ++{% endraw %}
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index e20a341..b2a6325 100644
+index 744304d..9bdbff5 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -7,3 +7,4 @@
+@@ -14,3 +14,4 @@
  /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch
  /usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch
  /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
diff --git a/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch b/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch
index 1b0f1137..91e13434 100644
--- a/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch
+++ b/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch
@@ -16,10 +16,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/mcp/patches/0003-maas-region-force-artifact-download.patch b/mcp/patches/0003-maas-region-force-artifact-download.patch
-index f0ce50f..9997552 100644
+index ecda80a..a8d27d7 100644
 --- a/mcp/patches/0003-maas-region-force-artifact-download.patch
 +++ b/mcp/patches/0003-maas-region-force-artifact-download.patch
-@@ -42,7 +42,7 @@ diff --git a/maas/files/maas-artifact-sync.sh b/maas/files/maas-artifact-sync.sh
+@@ -50,7 +50,7 @@ diff --git a/maas/files/maas-artifact-sync.sh b/maas/files/maas-artifact-sync.sh
  new file mode 100644
  --- /dev/null
  +++ b/maas/files/maas-artifact-sync.sh
@@ -28,7 +28,7 @@ index f0ce50f..9997552 100644
  +{%- from "maas/map.jinja" import region with context %}
  +#!/bin/bash
  +function wait_for {
-@@ -64,3 +64,8 @@ new file mode 100644
+@@ -72,3 +72,8 @@ new file mode 100644
  +wait_for 90 "! maas opnfv boot-resources is-importing | grep -q 'true'"
  +maas opnfv rack-controllers import-boot-images || exit 3
  +wait_for 30 "test -d /var/lib/maas/boot-resources/current/ubuntu/amd64"
diff --git a/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch b/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch
index a758659d..f98185d3 100644
--- a/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch
+++ b/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch
@@ -48,10 +48,10 @@ index 0000000..003b249
 + # Set the UNIX socket permissions for the R/O socket. This is used
 + # for monitoring VM status only
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index b2a6325..4dc47c7 100644
+index 9bdbff5..093bf05 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -8,3 +8,4 @@
+@@ -15,3 +15,4 @@
  /usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch
  /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
  /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
diff --git a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 73a0a786..3db98f5d 100644
--- a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
@@ -29,10 +29,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls
 
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 79ad880..327b159 100755
+index c645ffd..fb47893 100755
 --- a/mcp/config/states/virtual_control_plane
 +++ b/mcp/config/states/virtual_control_plane
-@@ -12,7 +12,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected
+@@ -18,7 +18,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected
 
  salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
 
diff --git a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 01e7faa6..4362dd6c 100644
--- a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -26,9 +26,9 @@ 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-ocata-odl-ha/infra/kvm.yml       | 18 ++++++++
- .../baremetal-mcp-ocata-ovs-ha/infra/kvm.yml       | 15 ++++++
- 5 files changed, 140 insertions(+)
+ .../baremetal-mcp-ocata-common/infra/kvm.yml       | 15 ++++++
+ .../baremetal-mcp-ocata-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..a9fe11b
 +
 + #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 4dc47c7..f6312b6 100644
+index 093bf05..7032a6d 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -9,3 +9,5 @@
+@@ -16,3 +16,5 @@
  /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
  /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
  /usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.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-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
-index b8b5208..badecc8 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
-@@ -34,26 +34,41 @@ parameters:
+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 b270e0f..4bf8dec 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
+@@ -40,21 +40,33 @@ parameters:
          openstack.control:
            cpu: 4
            ram: 12288
@@ -196,6 +196,8 @@ index b8b5208..badecc8 100644
 +          cpu_model: host-passthrough
            disk_profile: xxlarge
            net_profile: default
+         # stacklight.log:
+@@ -75,6 +87,9 @@ parameters:
          openstack.proxy:
            cpu: 2
            ram: 2048
@@ -204,62 +206,18 @@ index b8b5208..badecc8 100644
 +          cpu_model: host-passthrough
            disk_profile: small
            net_profile: default
-         # stacklight.log:
-@@ -74,6 +89,9 @@ parameters:
-         opendaylight.server:
-           cpu: 4
-           ram: 6144
-+          hw_firmware_type: uefi
-+          virt_machine_model: virt
-+          cpu_model: host-passthrough
-           disk_profile: small
-           net_profile: default
        cluster:
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
-index 730de08..2da10d7 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
-@@ -34,21 +34,33 @@ parameters:
-         openstack.control:
-           cpu: 4
-           ram: 12288
-+          hw_firmware_type: uefi
-+          virt_machine_model: virt
-+          cpu_model: host-passthrough
-           disk_profile: small
-           net_profile: default
-         openstack.database:
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
+index 344b190..3ac09f2 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
+@@ -17,6 +17,9 @@ parameters:
+         opendaylight.server:
            cpu: 4
            ram: 6144
 +          hw_firmware_type: uefi
 +          virt_machine_model: virt
 +          cpu_model: host-passthrough
-           disk_profile: large
-           net_profile: default
-         openstack.message_queue:
-           cpu: 4
-           ram: 2048
-+          hw_firmware_type: uefi
-+          virt_machine_model: virt
-+          cpu_model: host-passthrough
-           disk_profile: small
-           net_profile: default
-         openstack.telemetry:
-           cpu: 2
-           ram: 3072
-+          hw_firmware_type: uefi
-+          virt_machine_model: virt
-+          cpu_model: host-passthrough
-           disk_profile: xxlarge
-           net_profile: default
-         # stacklight.log:
-@@ -69,6 +81,9 @@ parameters:
-         openstack.proxy:
-           cpu: 2
-           ram: 2048
-+          hw_firmware_type: uefi
-+          virt_machine_model: virt
-+          cpu_model: host-passthrough
            disk_profile: small
            net_profile: default
        cluster:
diff --git a/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch
index bb1443d3..988b8fc8 100644
--- a/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch
+++ b/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch
@@ -32,10 +32,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  create mode 100644 mcp/salt-formulas/armband/files/cloud.py.diff
 
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 327b159..59424ac 100755
+index fb47893..899972c 100755
 --- a/mcp/config/states/virtual_control_plane
 +++ b/mcp/config/states/virtual_control_plane
-@@ -7,6 +7,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
+@@ -13,6 +13,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
  # KVM, compute node prereqs (libvirt first), VCP deployment
  salt -C 'kvm*' pkg.install bridge-utils
  salt -C 'kvm*' state.apply linux.network
diff --git a/patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch
index c684b434..a0356850 100644
--- a/patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch
+++ b/patches/opnfv-fuel/0011-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 f6312b6..17baeaa 100644
+index 7032a6d..875040f 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -11,3 +11,4 @@
+@@ -18,3 +18,4 @@
  /usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.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/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
index 6164d23d..4662d0fd 100644
--- a/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
+++ b/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
@@ -31,10 +31,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  1 file changed, 10 insertions(+)
 
 diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
-index 3a6deec..c355141 100644
+index 7449a21..4657195 100644
 --- a/mcp/scripts/lib.sh
 +++ b/mcp/scripts/lib.sh
-@@ -28,6 +28,15 @@ function get_base_image {
+@@ -35,6 +35,15 @@ function get_base_image {
    wget -P "${image_dir}" -N "${base_image}"
  }
 
@@ -50,7 +50,7 @@ index 3a6deec..c355141 100644
  function cleanup_vms {
    # clean up existing nodes
    for node in $(virsh list --name | grep -P '\w{3}\d{2}'); do
-@@ -45,6 +54,7 @@ function prepare_vms {
+@@ -52,6 +61,7 @@ function prepare_vms {
    local base_image=$2
    local image_dir=$3
 
diff --git a/patches/opnfv-fuel/0013-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0013-aarch64-skip-configuration-of-hugepages.patch
index 276b557d..f97fbf29 100644
--- a/patches/opnfv-fuel/0013-aarch64-skip-configuration-of-hugepages.patch
+++ b/patches/opnfv-fuel/0013-aarch64-skip-configuration-of-hugepages.patch
@@ -16,53 +16,14 @@ 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-ocata-odl-ha/openstack/compute.yml   |  4 ++--
- .../cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml      | 10 +++++-----
- .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml   |  4 ++--
- .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml      | 10 +++++-----
- 4 files changed, 14 insertions(+), 14 deletions(-)
+ .../classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml  | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-index e898353..1e58fee 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-@@ -5,8 +5,8 @@ classes:
-   - system.linux.storage.loopback
-   - system.glusterfs.client.cluster
-   - system.nova.compute.cluster
--  - system.nova.compute.nfv.hugepages
--  - system.nova.compute.nfv.cpu_pinning
-+  # - system.nova.compute.nfv.hugepages
-+  # - system.nova.compute.nfv.cpu_pinning
-   - system.neutron.gateway.opendaylight.single
-   - system.neutron.gateway.cluster
-   - system.cinder.volume.single
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-index c7df472..4db9ee0 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-@@ -102,11 +102,11 @@ parameters:
-     rabbitmq_secret_key: opnfv_secret
-     rabbitmq_admin_password: opnfv_secret
-     rabbitmq_openstack_password: opnfv_secret
--    nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
--    compute_hugepages_size: 1G
--    compute_hugepages_count: 16
--    compute_hugepages_mount: /mnt/hugepages_1G
--    compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
-+    # nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
-+    # compute_hugepages_size: 1G
-+    # compute_hugepages_count: 16
-+    # compute_hugepages_mount: /mnt/hugepages_1G
-+    # compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
-     glance_version: ${_param:openstack_version}
-     glance_service_host: ${_param:openstack_control_address}
-     keystone_version: ${_param:openstack_version}
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
-index cad293d..ca7a539 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
-@@ -5,8 +5,8 @@ classes:
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
+index 07561cd..60c9bb9 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
+@@ -12,8 +12,8 @@ classes:
    - system.linux.storage.loopback
    - system.glusterfs.client.cluster
    - system.nova.compute.cluster
@@ -73,24 +34,3 @@ index cad293d..ca7a539 100644
    - system.neutron.gateway.cluster
    - system.cinder.volume.single
    - system.cinder.volume.backend.lvm
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
-index 7ce282b..9401f60 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
-@@ -96,11 +96,11 @@ parameters:
-     rabbitmq_secret_key: opnfv_secret
-     rabbitmq_admin_password: opnfv_secret
-     rabbitmq_openstack_password: opnfv_secret
--    nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
--    compute_hugepages_size: 1G
--    compute_hugepages_count: 16
--    compute_hugepages_mount: /mnt/hugepages_1G
--    compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
-+    # nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
-+    # compute_hugepages_size: 1G
-+    # compute_hugepages_count: 16
-+    # compute_hugepages_mount: /mnt/hugepages_1G
-+    # compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
-     glance_version: ${_param:openstack_version}
-     glance_service_host: ${_param:openstack_control_address}
-     keystone_version: ${_param:openstack_version}
diff --git a/patches/opnfv-fuel/0014-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0014-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
index 2b9b6d9d..15c1c19f 100644
--- a/patches/opnfv-fuel/0014-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
+++ b/patches/opnfv-fuel/0014-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
@@ -22,10 +22,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-index 4db9ee0..9e37954 100644
+index 9a04c84..80e5bb7 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-@@ -203,7 +203,7 @@ parameters:
+@@ -27,7 +27,7 @@ parameters:
        repo:
          uca:
            source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
@@ -35,12 +35,12 @@ index 4db9ee0..9e37954 100644
            key_server: keyserver.ubuntu.com
        kernel:
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
-index 13d45f7..e7e0ff2 100644
+index aa6b4e3..5b6752e 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
-@@ -59,7 +59,7 @@ parameters:
+@@ -25,7 +25,7 @@ parameters:
+       repo:
          uca:
-           # yamllint disable-line rule:line-length
            source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
 -          architectures: amd64
 +          architectures: amd64,arm64
@@ -48,10 +48,10 @@ index 13d45f7..e7e0ff2 100644
            key_server: keyserver.ubuntu.com
      network:
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
-index 9fa69ba..3f3cdb4 100644
+index 5e855ac..2392cf0 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
-@@ -204,7 +204,7 @@ parameters:
+@@ -27,7 +27,7 @@ parameters:
        repo:
          uca:
            source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
@@ -61,12 +61,12 @@ index 9fa69ba..3f3cdb4 100644
            key_server: keyserver.ubuntu.com
        kernel:
 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
-index ddd804a..f989b6c 100644
+index 4a48b36..1e84493 100644
 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
-@@ -58,7 +58,7 @@ parameters:
+@@ -64,7 +64,7 @@ parameters:
+       repo:
          uca:
-           # yamllint disable-line rule:line-length
            source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
 -          architectures: amd64
 +          architectures: amd64,arm64
@@ -74,12 +74,12 @@ index ddd804a..f989b6c 100644
            key_server: keyserver.ubuntu.com
        kernel:
 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
-index ed03eb4..40fb60d 100644
+index 5be63e5..1cfd5a3 100644
 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
-@@ -11,7 +11,7 @@ parameters:
+@@ -17,7 +17,7 @@ parameters:
+       repo:
          uca:
-           # yamllint disable-line rule:line-length
            source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
 -          architectures: amd64
 +          architectures: amd64,arm64
diff --git a/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch
index 0b6598b8..bfcaba12 100644
--- a/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch
@@ -21,10 +21,10 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
  create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
 
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 59424ac..12fff84 100755
+index 899972c..1ea14b1 100755
 --- a/mcp/config/states/virtual_control_plane
 +++ b/mcp/config/states/virtual_control_plane
-@@ -6,6 +6,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
+@@ -12,6 +12,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
 
  # KVM, compute node prereqs (libvirt first), VCP deployment
  salt -C 'kvm*' pkg.install bridge-utils
@@ -32,7 +32,7 @@ index 59424ac..12fff84 100755
  salt -C 'kvm*' state.apply linux.network
  salt -C 'kvm*' state.apply armband.bootstrap_script_arm64
  salt -C 'kvm*' system.reboot
-@@ -30,6 +31,7 @@ while [ $rc -ne 0 ]; do
+@@ -36,6 +37,7 @@ while [ $rc -ne 0 ]; do
    rc=0
    for node in $vcp_nodes; do
      salt "$node" test.ping 2>/dev/null || { rc=$?; break; };
@@ -41,10 +41,10 @@ index 59424ac..12fff84 100755
    sleep 5
  done
 diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml
-index c9be2c2..5c84ec6 100644
+index aa780e6..e4069c0 100644
 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml
 +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml
-@@ -2,3 +2,7 @@
+@@ -9,3 +9,7 @@
  classes:
    - cluster.all-mcp-ocata-common.opnfv.runtime
    - cluster.all-mcp-ocata-common.opnfv.pod_config