u/fuel: Bump & rebase for net_config ip-range

JIRA: FUEL-351

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

13 files changed, 67 insertions, 65 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 e446d5fd..ac0dad1a 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
@@ -25,7 +25,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  2 files changed, 2 insertions(+)
 
 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 df23045..5bbe0fe 100644
+index df230452..5bbe0fe4 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 @@
@@ -37,7 +37,7 @@ index df23045..5bbe0fe 100644
    - service.keepalived.cluster.single
    - system.glusterfs.server.volume.glance
 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 cb7b32f..dd610ea 100644
+index bae1c1c6..a6c3d9ed 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 21bf4cba..c1f1b03e 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 4f3760f..115a56c 100755
+index 4f3760f6..115a56c1 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
@@ -56,7 +56,7 @@ index 4f3760f..115a56c 100755
  salt -C 'I@mongodb:server and *01*' state.sls mongodb || true
  wait_for 10 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
 diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
-index 9fc30bb..998fc6b 100755
+index 9fc30bbf..998fc6b4 100755
 --- a/mcp/config/states/openstack_noha
 +++ b/mcp/config/states/openstack_noha
 @@ -52,6 +52,8 @@ salt -I 'ceilometer:agent' state.sls ceilometer
@@ -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 48e45d4..afdfb4f 100755
+index 80c0c87e..144245f9 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
@@ -82,7 +82,7 @@ index 48e45d4..afdfb4f 100755
  salt -C 'kvm* or cmp*' state.apply salt
 diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
 new file mode 100644
-index 0000000..36ddf72
+index 00000000..36ddf72b
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
 @@ -0,0 +1,76 @@
@@ -164,7 +164,7 @@ index 0000000..36ddf72
 +         if image_meta.properties.get('hw_video_model'):
 diff --git a/mcp/salt-formulas/armband/init.sls b/mcp/salt-formulas/armband/init.sls
 new file mode 100644
-index 0000000..8a8cf2a
+index 00000000..8a8cf2ab
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/init.sls
 @@ -0,0 +1,7 @@
@@ -177,7 +177,7 @@ index 0000000..8a8cf2a
 + {%- endif %}
 diff --git a/mcp/salt-formulas/armband/nova_config.sls b/mcp/salt-formulas/armband/nova_config.sls
 new file mode 100644
-index 0000000..31fa031
+index 00000000..31fa031a
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/nova_config.sls
 @@ -0,0 +1,35 @@
@@ -218,7 +218,7 @@ index 0000000..31fa031
 +    - name: "service nova-compute restart"
 diff --git a/mcp/salt-formulas/armband/nova_libvirt.sls b/mcp/salt-formulas/armband/nova_libvirt.sls
 new file mode 100644
-index 0000000..bc2cbda
+index 00000000..bc2cbda9
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/nova_libvirt.sls
 @@ -0,0 +1,7 @@
@@ -231,7 +231,7 @@ index 0000000..bc2cbda
 +  - unless: 'test -f /var/cache/salt/minion/files/base/armband/files/nova-libvirt-aarch64-rollup.diff && cd /usr/lib/python2.7/dist-packages && patch -p1 -R --dry-run /var/cache/salt/minion/files/base/armband/files/nova-libvirt-aarch64-rollup.diff'
 diff --git a/mcp/salt-formulas/armband/qemu_efi.sls b/mcp/salt-formulas/armband/qemu_efi.sls
 new file mode 100644
-index 0000000..c697dae
+index 00000000..c697dae9
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/qemu_efi.sls
 @@ -0,0 +1,2 @@
@@ -239,7 +239,7 @@ index 0000000..c697dae
 +  pkg.installed
 diff --git a/mcp/salt-formulas/armband/vgabios.sls b/mcp/salt-formulas/armband/vgabios.sls
 new file mode 100644
-index 0000000..500c2bc
+index 00000000..500c2bcf
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/vgabios.sls
 @@ -0,0 +1,7 @@
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
index 965574c3..664aef8f 100644
--- 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
@@ -19,26 +19,28 @@ virtual POD with the Enea lab configuration specific to arm-virtual2
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/config/labs/local/idf-virtual1.yaml | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
+ mcp/config/labs/local/idf-virtual1.yaml | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/mcp/config/labs/local/idf-virtual1.yaml b/mcp/config/labs/local/idf-virtual1.yaml
-index 2142baf..415f63c 100644
+index f7302494..ab376ab7 100644
 --- a/mcp/config/labs/local/idf-virtual1.yaml
 +++ b/mcp/config/labs/local/idf-virtual1.yaml
-@@ -41,9 +41,9 @@ idf:
+@@ -42,10 +42,10 @@ idf:
      public:
        interface: 3  # when used, will be fourth vnet interface, untagged
        vlan: native
 -      network: 10.16.0.0
+-      ip-range: 10.16.0.10-10.16.0.254  # Some IPs are in use by lab infra
 +      network: 10.0.9.0
++      ip-range: 10.0.9.10-10.0.9.253  # Some IPs are in use by lab infra
        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:
+@@ -61,16 +61,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
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 cbb6b264..c732f719 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 e709313..a1ebf76 100644
+index e7093130..a1ebf764 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 3eed506f..e1aefaa7 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
@@ -26,7 +26,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 
 diff --git a/mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
 new file mode 100644
-index 0000000..0368937
+index 00000000..0368937d
 --- /dev/null
 +++ b/mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
 @@ -0,0 +1,35 @@
@@ -66,16 +66,16 @@ index 0000000..0368937
 +   file.managed:
 +   - source: salt://maas/files/pgpass
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index e0ad1f7..59b617d 100644
+index efe38218..76d782e1 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -16,3 +16,4 @@
+@@ -17,3 +17,4 @@
  /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch
  /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
  /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch
 +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
 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 e83de35..226a4f6 100644
+index e83de35c..226a4f66 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:
@@ -123,7 +123,7 @@ index e83de35..226a4f6 100644
            name: ${_param:opnfv_infra_maas_pxe_network_address}/24
 diff --git a/mcp/salt-formulas/maas/files/curtin_userdata_arm64_generic_xenial b/mcp/salt-formulas/maas/files/curtin_userdata_arm64_generic_xenial
 new file mode 100644
-index 0000000..15d10a4
+index 00000000..15d10a48
 --- /dev/null
 +++ b/mcp/salt-formulas/maas/files/curtin_userdata_arm64_generic_xenial
 @@ -0,0 +1,35 @@
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 6a0ce3d8..b13390f4 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,7 +16,7 @@ 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 b61a3d1..e38b6c1 100644
+index b61a3d1b..e38b6c1a 100644
 --- a/mcp/patches/0003-maas-region-force-artifact-download.patch
 +++ b/mcp/patches/0003-maas-region-force-artifact-download.patch
 @@ -50,7 +50,7 @@ diff --git a/maas/files/maas-artifact-sync.sh b/maas/files/maas-artifact-sync.sh
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 f995c32e..80df4caf 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 d3a255d..9bfe535 100755
+index a7941e00..0c41557d 100755
 --- a/mcp/config/states/baremetal_init
 +++ b/mcp/config/states/baremetal_init
 @@ -35,6 +35,7 @@ wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping"
@@ -54,7 +54,7 @@ index d3a255d..9bfe535 100755
 
 diff --git a/mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff b/mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff
 new file mode 100644
-index 0000000..9e74c24
+index 00000000..9e74c240
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff
 @@ -0,0 +1,101 @@
@@ -161,7 +161,7 @@ index 0000000..9e74c24
 + def purge(vm_, dirs=False):
 diff --git a/mcp/salt-formulas/armband/salt_minion.sls b/mcp/salt-formulas/armband/salt_minion.sls
 new file mode 100644
-index 0000000..9cce636
+index 00000000..9cce6367
 --- /dev/null
 +++ b/mcp/salt-formulas/armband/salt_minion.sls
 @@ -0,0 +1,7 @@
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 9000b498..a50b875e 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
@@ -27,14 +27,14 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  ...4-salt-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++++
  mcp/patches/patches.list                           |  2 +
  .../cluster/mcp-pike-common-ha/infra/kvm.yml       | 15 ++++++
- .../classes/cluster/mcp-pike-odl-ha/infra/kvm.yml  |  3 ++
+ .../cluster/mcp-pike-odl-ha/infra/kvm.yml.j2       |  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
 
 diff --git a/mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch b/mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch
 new file mode 100644
-index 0000000..706b67d
+index 00000000..706b67da
 --- /dev/null
 +++ b/mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch
 @@ -0,0 +1,54 @@
@@ -94,7 +94,7 @@ index 0000000..706b67d
 +         for dev in kwargs['boot_dev'].split():
 diff --git a/mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch b/mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch
 new file mode 100644
-index 0000000..78eb0bf
+index 00000000..78eb0bff
 --- /dev/null
 +++ b/mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch
 @@ -0,0 +1,51 @@
@@ -150,17 +150,17 @@ index 0000000..78eb0bf
 +
 + #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 59b617d..520a275 100644
+index 76d782e1..0b6bf960 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -17,3 +17,5 @@
+@@ -18,3 +18,5 @@
  /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
  /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.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/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
-index 5bbe0fe..84b392e 100644
+index 5bbe0fe4..84b392e6 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
 @@ -53,21 +53,33 @@ parameters:
@@ -207,11 +207,11 @@ index 5bbe0fe..84b392e 100644
            disk_profile: small
            net_profile: default_ext
        cluster:
-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 e2b18e4..e807209 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:
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
+index 81135d6a..36908b18 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
++++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
+@@ -19,6 +19,9 @@ parameters:
          opendaylight.server:
            cpu: 4
            ram: 6144
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 efdfa3bb..72d9278f 100644
--- a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
+++ b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
@@ -22,7 +22,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 
 diff --git a/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
 new file mode 100644
-index 0000000..d40e63b
+index 00000000..d40e63b2
 --- /dev/null
 +++ b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
 @@ -0,0 +1,22 @@
@@ -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 520a275..f7d25d3 100644
+index 0b6bf960..601ad91c 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -19,3 +19,4 @@
+@@ -20,3 +20,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-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
index bd6edb83..3461bb21 100644
--- a/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
+++ b/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
@@ -14,15 +14,15 @@ JIRA: https://jira.opnfv.org/browse/ARMBAND-304
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml   | 2 +-
- mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml | 2 +-
+ mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 | 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/mcp-pike-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml
-index d2d611c..0a3fc6f 100644
---- 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:
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
+index 3b890da0..5b9d24e7 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
+@@ -251,7 +251,7 @@ parameters:
        repo:
          uca:
            source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
@@ -32,7 +32,7 @@ index d2d611c..0a3fc6f 100644
            key_server: keyserver.ubuntu.com
        kernel:
 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 46d7af4..076f38a 100644
+index 46d7af4a..076f38a9 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:
diff --git a/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch
index 37638387..d9577cdd 100644
--- a/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0011-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 9bfe535..82649df 100755
+index 0c41557d..799a9419 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 \
@@ -34,7 +34,7 @@ index 9bfe535..82649df 100755
  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 afdfb4f..0c0d69c 100755
+index 144245f9..8ea75f17 100755
 --- a/mcp/config/states/virtual_control_plane
 +++ b/mcp/config/states/virtual_control_plane
 @@ -39,6 +39,7 @@ vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:no
@@ -46,7 +46,7 @@ index afdfb4f..0c0d69c 100755
 
  # Propagate APT proxy config created by curtin on baremetal nodes to VCP VMs
 diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml
-index f9aeb71..21a5de4 100644
+index f9aeb71a..21a5de4e 100644
 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml
 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml
 @@ -9,3 +9,7 @@
@@ -59,7 +59,7 @@ index f9aeb71..21a5de4 100644
 +    opnfv_user_password: $1$5/pIEHT1$XFBhNWW4Q8gYd19hczgPF1
 diff --git a/mcp/salt-formulas/opnfv/adduser.sls b/mcp/salt-formulas/opnfv/adduser.sls
 new file mode 100644
-index 0000000..78ef993
+index 00000000..78ef993d
 --- /dev/null
 +++ b/mcp/salt-formulas/opnfv/adduser.sls
 @@ -0,0 +1,7 @@
diff --git a/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch b/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch
index c8c546b4..c37ba01e 100644
--- a/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch
+++ b/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch
@@ -15,13 +15,13 @@ so stick to 3.12 for now.
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- 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 +-
+ 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.j2 | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 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 84b392e..1209f31 100644
+index 84b392e6..1209f312 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
 @@ -28,7 +28,7 @@ classes:
@@ -34,10 +34,10 @@ index 84b392e..1209f31 100644
      cluster_node01_address: ${_param:infra_kvm_node01_address}
      cluster_node02_address: ${_param:infra_kvm_node02_address}
 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 dd610ea..6aa7b5d 100644
+index a6c3d9ed..d730c935 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
-@@ -35,7 +35,7 @@ parameters:
+@@ -34,7 +34,7 @@ parameters:
      keepalived_vip_interface: br-ctl
      keepalived_vip_virtual_router_id: 69
      linux_system_codename: xenial
@@ -46,16 +46,16 @@ index dd610ea..6aa7b5d 100644
    glusterfs:
      client:
        volumes:
-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 b08f3c2..84d35be 100644
---- 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:
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
+index c487e342..62c1ab28 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
+@@ -66,7 +66,7 @@ parameters:
      cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
      cluster_node03_address: ${_param:openstack_control_node03_address}
      nova_vncproxy_url: https://${_param:cluster_public_host}:6080
 -    glusterfs_version: '3.13'
 +    glusterfs_version: '3.12'
+ {%- if conf.MCP_VCP %}
    heat:
      server:
-       metadata:
diff --git a/patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch b/patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch
index 72bb96c8..28388d41 100644
--- a/patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch
+++ b/patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch
@@ -16,7 +16,7 @@ This reverts commit d06bcfb72c44b507c3efee4de00f415869f48450.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 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 226a4f6..a298742 100644
+index 226a4f66..a2987423 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: