u/fuel: Bump & rebase for PDF-compatible reclass

JIRA: ARMBAND-292

Change-Id: I913ac6ec20cd34573c0e91989d7fd49a79abafaa
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 397cd1932fae59622f3cc2d782faf68b803f4860)

14 files changed, 251 insertions, 307 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 68b013af..7231d5c1 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,10 +48,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  create mode 100644 mcp/salt-formulas/armband/vgabios.sls
 
 diff --git a/mcp/config/states/maas b/mcp/config/states/maas
-index 0d733ba..bfedbae 100755
+index de9d699..9427112 100755
 --- a/mcp/config/states/maas
 +++ b/mcp/config/states/maas
-@@ -85,6 +85,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected
+@@ -87,6 +87,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected
 
  salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
 
diff --git a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
index d01c520c..aafa3c81 100644
--- a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
+++ b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
@@ -30,7 +30,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
  .../baremetal-mcp-ocata-odl-ha/infra/config.yml    |  4 ++--
  .../baremetal-mcp-ocata-odl-ha/infra/kvm.yml       | 18 +++++++++-----
- .../baremetal-mcp-ocata-odl-ha/infra/maas.yml      |  8 +++----
+ .../baremetal-mcp-ocata-odl-ha/infra/maas.yml      |  6 ++---
  .../opendaylight/control.yml                       |  2 +-
  .../openstack/compute.yml                          | 28 ++++++++--------------
  .../openstack/control.yml                          |  6 ++---
@@ -40,16 +40,16 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  .../baremetal-mcp-ocata-odl-ha/openstack/proxy.yml |  6 ++---
  .../openstack/telemetry.yml                        |  6 ++---
  .../baremetal-mcp-ocata-ovs-ha/infra/config.yml    |  4 ++--
- .../baremetal-mcp-ocata-ovs-ha/infra/kvm.yml       | 18 +++++++++-----
- .../baremetal-mcp-ocata-ovs-ha/infra/maas.yml      |  8 +++----
- .../openstack/compute.yml                          | 27 ++++++++-------------
+ .../baremetal-mcp-ocata-ovs-ha/infra/kvm.yml       | 16 +++++++++----
+ .../baremetal-mcp-ocata-ovs-ha/infra/maas.yml      |  6 ++---
+ .../openstack/compute.yml                          | 19 +++++----------
  .../openstack/control.yml                          |  6 ++---
  .../openstack/dashboard.yml                        |  4 ++--
  .../openstack/database.yml                         |  6 ++---
  .../openstack/message_queue.yml                    |  6 ++---
  .../baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml |  6 ++---
  .../openstack/telemetry.yml                        |  6 ++---
- 21 files changed, 91 insertions(+), 94 deletions(-)
+ 21 files changed, 84 insertions(+), 87 deletions(-)
 
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
 index 3f72e18..bd439a4 100644
@@ -67,7 +67,7 @@ index 3f72e18..bd439a4 100644
      master:
        accept_policy: open_mode
 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 acd6a6d..76e32bc 100644
+index e55bcbf..bbdf354 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
 @@ -25,7 +25,8 @@ parameters:
@@ -125,21 +125,19 @@ index acd6a6d..76e32bc 100644
 -          - ${_param:deploy_nic}.300
 +          - ${_param:trunk_nic}.2183
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
-index 72b9f52..08a3b48 100644
+index 64ae85a..40d9c2d 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
-@@ -4,10 +4,10 @@ classes:
+@@ -4,9 +4,9 @@ classes:
  - cluster.baremetal-mcp-ocata-odl-ha.infra
  parameters:
    _param:
 -    dhcp_interface: ens3
 -    primary_interface: ens4
 -    pxe_interface: ens5
--    external_interface: ens6
 +    dhcp_interface: enp1s0
 +    primary_interface: enp2s0
 +    pxe_interface: enp3s0
-+    external_interface: enp4s0
      interface_mtu: 1500
      # MaaS has issues using MTU > 1500 for PXE interface
      pxe_interface_mtu: 1500
@@ -157,7 +155,7 @@ index 0a01af7..367343a 100644
            type: eth
            proto: static
 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 c5333fe..6f1162d 100644
+index d2495c2..79cea91 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
 @@ -24,10 +24,9 @@ parameters:
@@ -173,7 +171,7 @@ index c5333fe..6f1162d 100644
      interface_mtu: 1500
      keepalived_vip_interface: br-ctl
      keepalived_vip_virtual_router_id: 69
-@@ -71,12 +70,6 @@ parameters:
+@@ -76,12 +75,6 @@ parameters:
            type: eth
            proto: manual
            name: ${_param:tenant_nic}
@@ -186,7 +184,7 @@ index c5333fe..6f1162d 100644
          br-mesh:
            enabled: true
            type: bridge
-@@ -84,19 +77,19 @@ parameters:
+@@ -89,19 +82,19 @@ parameters:
            netmask: 255.255.255.0
            mtu: 1500
            use_interfaces:
@@ -212,7 +210,7 @@ index c5333fe..6f1162d 100644
            use_interfaces:
            - ${_param:tenant_nic}
          br-ctl:
-@@ -106,7 +99,7 @@ parameters:
+@@ -111,7 +104,7 @@ parameters:
            address: ${_param:single_address}
            netmask: 255.255.255.0
            use_interfaces:
@@ -221,7 +219,7 @@ index c5333fe..6f1162d 100644
          br-floating:
            enabled: true
            type: ovs_bridge
-@@ -123,7 +116,6 @@ parameters:
+@@ -128,7 +121,6 @@ parameters:
            address: ${_param:external_address}
            netmask: 255.255.255.0
            use_interfaces:
@@ -357,10 +355,10 @@ index 4e90090..c08f209 100644
      server:
        logging:
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
-index a75b41d..3979fd1 100644
+index 4520621..40b62d4 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
-@@ -32,8 +32,8 @@ parameters:
+@@ -31,8 +31,8 @@ parameters:
    linux:
      network:
        interface:
@@ -372,7 +370,7 @@ index a75b41d..3979fd1 100644
      master:
        accept_policy: open_mode
 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 7550c1a..40e800f 100644
+index 3e9879b..0ae3f4d 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
 @@ -25,7 +25,8 @@ parameters:
@@ -406,50 +404,43 @@ index 7550c1a..40e800f 100644
          br-mgmt:
            enabled: true
            proto: dhcp
-@@ -149,13 +155,13 @@ parameters:
-           use_interfaces:
-           - ${_param:deploy_nic}
-           noifupdown: true
--        vlan300:
-+        vlan2183:
+@@ -151,9 +157,9 @@ parameters:
            enabled: true
            proto: manual
            type: vlan
--          name: ${_param:deploy_nic}.300
-+          name: ${_param:trunk_nic}.2183
+-          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
-@@ -163,4 +169,4 @@ parameters:
+@@ -161,4 +167,4 @@ parameters:
            address: ${_param:single_address}
            netmask: 255.255.255.0
            use_interfaces:
--          - ${_param:deploy_nic}.300
-+          - ${_param:trunk_nic}.2183
+-          - ${_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/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
-index f77abea..37e8377 100644
+index 3a98fac..799e31f 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
-@@ -4,10 +4,10 @@ classes:
+@@ -4,9 +4,9 @@ classes:
  - cluster.baremetal-mcp-ocata-ovs-ha.infra
  parameters:
    _param:
 -    dhcp_interface: ens3
 -    primary_interface: ens4
 -    pxe_interface: ens5
--    external_interface: ens6
 +    dhcp_interface: enp1s0
 +    primary_interface: enp2s0
 +    pxe_interface: enp3s0
-+    external_interface: enp4s0
      interface_mtu: 1500
      # MaaS has issues using MTU > 1500 for PXE interface
      pxe_interface_mtu: 1500
 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 93a26b1..7f5a602 100644
+index fca4065..19c7f0b 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
 @@ -23,9 +23,8 @@ parameters:
@@ -464,7 +455,7 @@ index 93a26b1..7f5a602 100644
      linux_system_codename: xenial
      interface_mtu: 1500
      keepalived_vip_interface: br-ctl
-@@ -54,12 +53,6 @@ parameters:
+@@ -59,12 +58,6 @@ parameters:
            type: eth
            proto: manual
            name: ${_param:tenant_nic}
@@ -477,42 +468,28 @@ index 93a26b1..7f5a602 100644
          br-mesh:
            enabled: true
            type: bridge
-@@ -67,19 +60,19 @@ parameters:
-           netmask: 255.255.255.0
-           mtu: 1500
-           use_interfaces:
--          - ${_param:tenant_nic}.302
--        vlan300:
-+          - ${_param:tenant_nic}.2185
-+        vlan2183:
+@@ -77,9 +70,9 @@ parameters:
            enabled: true
            proto: manual
            type: vlan
--          name: ${_param:mgmt_nic}.300
-+          name: ${_param:tenant_nic}.2183
+-          name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
++          name: ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
            use_interfaces:
 -          - ${_param:mgmt_nic}
--        vlan302:
 +          - ${_param:tenant_nic}
-+        vlan2185:
+         tenant-vlan:
            enabled: true
            proto: manual
-           type: vlan
--          name: ${_param:tenant_nic}.302
-+          name: ${_param:tenant_nic}.2185
-           use_interfaces:
-           - ${_param:tenant_nic}
-         br-ctl:
-@@ -89,7 +82,7 @@ parameters:
+@@ -94,7 +87,7 @@ parameters:
            address: ${_param:single_address}
            netmask: 255.255.255.0
            use_interfaces:
--          - ${_param:mgmt_nic}.300
-+          - ${_param:tenant_nic}.2183
+-          - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
++          - ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
          br-floating:
            enabled: true
            type: ovs_bridge
-@@ -106,6 +99,6 @@ parameters:
+@@ -111,6 +104,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 8b8cfefe..1a81bbfd 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,11 +102,11 @@ index 0000000..b969e07
 ++{{endif}}
 ++{% endraw %}
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index f65daab..ed2dd4e 100644
+index 4140adb..0607ef9 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -7,3 +7,4 @@
- /usr/share/salt-formulas/env: 0007-linux.network.interface-noifupdown-support.patch
+@@ -8,3 +8,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
 +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
diff --git a/patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch
index 020fcaaa..f64726d0 100644
--- a/patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch
+++ b/patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch
@@ -12,17 +12,15 @@ Subject: [PATCH] network: public, mgmt: Use arm-pod3 POD config
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- .../baremetal-mcp-ocata-odl-ha/infra/init.yml      | 20 +++----
+ .../baremetal-mcp-ocata-odl-ha/infra/init.yml      | 18 +++----
  .../baremetal-mcp-ocata-odl-ha/openstack/init.yml  | 62 +++++++++++-----------
- .../baremetal-mcp-ocata-ovs-ha/infra/init.yml      | 20 +++----
- .../baremetal-mcp-ocata-ovs-ha/openstack/init.yml  | 60 ++++++++++-----------
- 4 files changed, 81 insertions(+), 81 deletions(-)
+ 2 files changed, 40 insertions(+), 40 deletions(-)
 
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
-index 730193a..af3daf5 100644
+index 29b2521..fe264ce 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
-@@ -17,19 +17,19 @@ parameters:
+@@ -17,18 +17,18 @@ parameters:
      infra_maas_database_password: opnfv_secret
 
      # infra service addresses
@@ -31,12 +29,10 @@ index 730193a..af3daf5 100644
      infra_config_deploy_address: 10.20.0.2
 -    infra_maas_node01_address: 10.167.4.3
 +    infra_maas_node01_address: 172.16.10.3
-     infra_maas_node01_deploy_address: ${_param:opnfv_fuel_maas_pxe_address}
--    infra_maas_node01_external_address: 10.16.0.3
+     infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address}
 -    infra_compute_node01_address: 10.167.4.141
 -    infra_compute_node02_address: 10.167.4.142
 -    infra_compute_node03_address: 10.167.4.143
-+    infra_maas_node01_external_address: 10.0.8.2
 +    infra_compute_node01_address: 172.16.10.141
 +    infra_compute_node02_address: 172.16.10.142
 +    infra_compute_node03_address: 172.16.10.143
@@ -146,127 +142,3 @@ index e49a205..ad99447 100644
      opendaylight_service_host: ${_param:opendaylight_server_node01_single_address}
      opendaylight_server_node01_hostname: odl01
      opendaylight_router: odl-router_v2
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
-index 6bf0fbe..9df480f 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
-@@ -17,19 +17,19 @@ parameters:
-     infra_maas_database_password: opnfv_secret
-
-     # infra service addresses
--    infra_config_address: 10.167.4.100
-+    infra_config_address: 172.16.10.100
-     infra_config_deploy_address: 10.20.0.2
--    infra_maas_node01_address: 10.167.4.3
-+    infra_maas_node01_address: 172.16.10.3
-     infra_maas_node01_deploy_address: ${_param:opnfv_fuel_maas_pxe_address}
--    infra_maas_node01_external_address: 10.16.0.3
--    infra_compute_node01_address: 10.167.4.141
--    infra_compute_node02_address: 10.167.4.142
--    infra_compute_node03_address: 10.167.4.143
-+    infra_maas_node01_external_address: 10.0.8.2
-+    infra_compute_node01_address: 172.16.10.141
-+    infra_compute_node02_address: 172.16.10.142
-+    infra_compute_node03_address: 172.16.10.143
-
--    infra_kvm_address: 10.167.4.140
--    infra_kvm_node01_address: 10.167.4.141
--    infra_kvm_node02_address: 10.167.4.142
--    infra_kvm_node03_address: 10.167.4.143
-+    infra_kvm_address: 172.16.10.140
-+    infra_kvm_node01_address: 172.16.10.141
-+    infra_kvm_node02_address: 172.16.10.142
-+    infra_kvm_node03_address: 172.16.10.143
-
-     infra_maas_node01_hostname: mas01
-     infra_kvm_node01_hostname: kvm01
-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 9c2bc7b..90e0cf3 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
-@@ -3,9 +3,9 @@ parameters:
-
-     openstack_version: ocata
-
--    openstack_gateway_node01_address: 10.167.4.124
--    openstack_gateway_node02_address: 10.167.4.125
--    openstack_gateway_node03_address: 10.167.4.126
-+    openstack_gateway_node01_address: 172.16.10.124
-+    openstack_gateway_node02_address: 172.16.10.125
-+    openstack_gateway_node03_address: 172.16.10.126
-     openstack_gateway_node01_tenant_address: 10.1.0.6
-     openstack_gateway_node02_tenant_address: 10.1.0.7
-     openstack_gateway_node03_tenant_address: 10.1.0.9
-@@ -14,21 +14,21 @@ parameters:
-     openstack_gateway_node03_hostname: gtw03
-
-     # openstack service addresses
--    openstack_proxy_address: 10.167.4.80
--    openstack_proxy_node01_address: 10.167.4.81
--    openstack_proxy_node02_address: 10.167.4.82
--    openstack_control_address: 10.167.4.10
--    openstack_control_node01_address: 10.167.4.11
--    openstack_control_node02_address: 10.167.4.12
--    openstack_control_node03_address: 10.167.4.13
--    openstack_database_address: 10.167.4.50
--    openstack_database_node01_address: 10.167.4.51
--    openstack_database_node02_address: 10.167.4.52
--    openstack_database_node03_address: 10.167.4.53
--    openstack_message_queue_address: 10.167.4.40
--    openstack_message_queue_node01_address: 10.167.4.41
--    openstack_message_queue_node02_address: 10.167.4.42
--    openstack_message_queue_node03_address: 10.167.4.43
-+    openstack_proxy_address: 172.16.10.80
-+    openstack_proxy_node01_address: 172.16.10.81
-+    openstack_proxy_node02_address: 172.16.10.82
-+    openstack_control_address: 172.16.10.10
-+    openstack_control_node01_address: 172.16.10.11
-+    openstack_control_node02_address: 172.16.10.12
-+    openstack_control_node03_address: 172.16.10.13
-+    openstack_database_address: 172.16.10.50
-+    openstack_database_node01_address: 172.16.10.51
-+    openstack_database_node02_address: 172.16.10.52
-+    openstack_database_node03_address: 172.16.10.53
-+    openstack_message_queue_address: 172.16.10.40
-+    openstack_message_queue_node01_address: 172.16.10.41
-+    openstack_message_queue_node02_address: 172.16.10.42
-+    openstack_message_queue_node03_address: 172.16.10.43
-
-
-     openstack_telemetry_hostname: mdb
-@@ -36,23 +36,23 @@ parameters:
-     openstack_telemetry_node02_hostname: mdb02
-     openstack_telemetry_node03_hostname: mdb03
-
--    openstack_telemetry_address: 10.167.4.75
--    openstack_telemetry_node01_address: 10.167.4.76
--    openstack_telemetry_node02_address: 10.167.4.77
--    openstack_telemetry_node03_address: 10.167.4.78
-+    openstack_telemetry_address: 172.16.10.75
-+    openstack_telemetry_node01_address: 172.16.10.76
-+    openstack_telemetry_node02_address: 172.16.10.77
-+    openstack_telemetry_node03_address: 172.16.10.78
-
-     # OpenStack Compute
--    openstack_compute_node01_single_address: 10.167.4.101
--    openstack_compute_node02_single_address: 10.167.4.102
--    openstack_compute_node03_single_address: 10.167.4.103
--    openstack_compute_node01_control_address: 10.167.4.101
--    openstack_compute_node02_control_address: 10.167.4.102
--    openstack_compute_node03_control_address: 10.167.4.103
-+    openstack_compute_node01_single_address: 172.16.10.101
-+    openstack_compute_node02_single_address: 172.16.10.102
-+    openstack_compute_node03_single_address: 172.16.10.103
-+    openstack_compute_node01_control_address: 172.16.10.101
-+    openstack_compute_node02_control_address: 172.16.10.102
-+    openstack_compute_node03_control_address: 172.16.10.103
-     openstack_compute_node01_tenant_address: 10.1.0.101
-     openstack_compute_node02_tenant_address: 10.1.0.102
-     openstack_compute_node03_tenant_address: 10.1.0.103
--    openstack_compute_node01_external_address: 172.30.10.2
--    openstack_compute_node02_external_address: 172.30.10.3
-+    openstack_compute_node01_external_address: 10.0.8.101
-+    openstack_compute_node02_external_address: 10.0.8.102
-
-     # openstack service hostnames
-     openstack_proxy_hostname: prx
diff --git a/patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch b/patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch
index ac3d1356..f915929f 100644
--- a/patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch
+++ b/patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch
@@ -17,96 +17,13 @@ FIXME: Read all this info from PDF (Pod Descriptor File) later.
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
  .../baremetal-mcp-ocata-odl-ha/infra/maas.yml      | 40 +++++++++++-----------
- .../baremetal-mcp-ocata-ovs-ha/infra/maas.yml      | 40 +++++++++++-----------
- 2 files changed, 40 insertions(+), 40 deletions(-)
+ 1 file changed, 20 insertions(+), 20 deletions(-)
 
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
-index 08a3b48..3568c78 100644
+index 40d9c2d..b6735fc 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
-@@ -48,57 +48,57 @@ parameters:
-       machines:
-         kvm01:
-           interface:
--            mac: "00:25:b5:a0:00:2a"
-+            mac: "e0:ff:f7:00:08:ae"
-           power_parameters:
--            power_address: "172.30.8.75"
--            power_password: "octopus"
-+            power_address: "10.0.8.3"
-+            power_password: "admin"
-             power_type: ipmi
-             power_user: "admin"
--          architecture: 'amd64/generic'
-+          architecture: 'arm64/generic'
-           distro_series: xenial
-           hwe_kernel: hwe-16.04
-         kvm02:
-           interface:
--            mac: "00:25:b5:a0:00:3a"
-+            mac: "e0:ff:f7:00:08:b1"
-           power_parameters:
--            power_address: "172.30.8.65"
--            power_password: "octopus"
-+            power_address: "10.0.8.4"
-+            power_password: "admin"
-             power_type: ipmi
-             power_user: "admin"
--          architecture: 'amd64/generic'
-+          architecture: 'arm64/generic'
-           distro_series: xenial
-           hwe_kernel: hwe-16.04
-         kvm03:
-           interface:
--            mac: "00:25:b5:a0:00:4a"
-+            mac: "e0:ff:f7:00:08:bd"
-           power_parameters:
--            power_address: "172.30.8.74"
--            power_password: "octopus"
-+            power_address: "10.0.8.5"
-+            power_password: "admin"
-             power_type: ipmi
-             power_user: "admin"
--          architecture: 'amd64/generic'
-+          architecture: 'arm64/generic'
-           distro_series: xenial
-           hwe_kernel: hwe-16.04
-         cmp001:
-           interface:
--            mac: "00:25:b5:a0:00:5a"
-+            mac: "e0:ff:f7:00:08:c6"
-           power_parameters:
--            power_address: "172.30.8.73"
--            power_password: "octopus"
-+            power_address: "10.0.8.6"
-+            power_password: "admin"
-             power_type: ipmi
-             power_user: "admin"
--          architecture: 'amd64/generic'
-+          architecture: 'arm64/generic'
-           distro_series: xenial
-           hwe_kernel: hwe-16.04
-         cmp002:
-           interface:
--            mac: "00:25:b5:a0:00:6a"
-+            mac: "e0:ff:f7:00:08:cf"
-           power_parameters:
--            power_address: "172.30.8.72"
--            power_password: "octopus"
-+            power_address: "10.0.8.7"
-+            power_password: "admin"
-             power_type: ipmi
-             power_user: "admin"
--          architecture: 'amd64/generic'
-+          architecture: 'arm64/generic'
-           distro_series: xenial
-           hwe_kernel: hwe-16.04
-   linux:
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
-index 37e8377..d71b3a6 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
-@@ -48,57 +48,57 @@ parameters:
+@@ -47,57 +47,57 @@ parameters:
        machines:
          kvm01:
            interface:
diff --git a/patches/opnfv-fuel/0009-libvirt-Use-libvirt-unix_sock_group.patch b/patches/opnfv-fuel/0009-libvirt-Use-libvirt-unix_sock_group.patch
index 1d79c151..1a6b2f98 100644
--- a/patches/opnfv-fuel/0009-libvirt-Use-libvirt-unix_sock_group.patch
+++ b/patches/opnfv-fuel/0009-libvirt-Use-libvirt-unix_sock_group.patch
@@ -48,11 +48,11 @@ 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 ed2dd4e..46a9556 100644
+index 0607ef9..4d75677 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -8,3 +8,4 @@
- /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch
+@@ -9,3 +9,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
 +/usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
diff --git a/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 15820d2b..eb5931a6 100644
--- a/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0010-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/maas b/mcp/config/states/maas
-index bfedbae..6beef6f 100755
+index 9427112..ca476c5 100755
 --- a/mcp/config/states/maas
 +++ b/mcp/config/states/maas
-@@ -85,7 +85,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected
+@@ -87,7 +87,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected
 
  salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
 
diff --git a/patches/opnfv-fuel/0011-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0011-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 91acb494..ea2007ef 100644
--- a/patches/opnfv-fuel/0011-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0011-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -150,23 +150,23 @@ index 0000000..a9fe11b
 +
 + #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 46a9556..f6504ab 100644
+index 4d75677..2211c14 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -9,3 +9,5 @@
- /usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch
+@@ -10,3 +10,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 76e32bc..bd4234b 100644
+index bbdf354..06a5d0c 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:
          openstack.control:
            cpu: 4
-           ram: 10240
+           ram: 12288
 +          hw_firmware_type: uefi
 +          virt_machine_model: virt
 +          cpu_model: host-passthrough
@@ -174,7 +174,7 @@ index 76e32bc..bd4234b 100644
            net_profile: default
          openstack.database:
            cpu: 4
-           ram: 8192
+           ram: 6144
 +          hw_firmware_type: uefi
 +          virt_machine_model: virt
 +          cpu_model: host-passthrough
@@ -216,13 +216,13 @@ index 76e32bc..bd4234b 100644
            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 40e800f..27b1e07 100644
+index 0ae3f4d..4243d91 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,26 +34,41 @@ parameters:
          openstack.control:
            cpu: 4
-           ram: 10240
+           ram: 12288
 +          hw_firmware_type: uefi
 +          virt_machine_model: virt
 +          cpu_model: host-passthrough
@@ -230,7 +230,7 @@ index 40e800f..27b1e07 100644
            net_profile: default
          openstack.database:
            cpu: 4
-           ram: 8192
+           ram: 6144
 +          hw_firmware_type: uefi
 +          virt_machine_model: virt
 +          cpu_model: host-passthrough
diff --git a/patches/opnfv-fuel/0012-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0012-mcp-salt-formulas-armband-AArch64-bootstrap.patch
index ed6bf133..f9d73810 100644
--- a/patches/opnfv-fuel/0012-mcp-salt-formulas-armband-AArch64-bootstrap.patch
+++ b/patches/opnfv-fuel/0012-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/maas b/mcp/config/states/maas
-index 6beef6f..3aafaf5 100755
+index ca476c5..c4f59cc 100755
 --- a/mcp/config/states/maas
 +++ b/mcp/config/states/maas
-@@ -80,6 +80,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
+@@ -82,6 +82,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
 
  salt -C 'kvm*' pkg.install bridge-utils
  salt -C 'kvm*' state.apply linux.network
diff --git a/patches/opnfv-fuel/0013-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0013-seedng-module-Add-AArch64-repo.patch
index 24789a07..4f6474a1 100644
--- a/patches/opnfv-fuel/0013-seedng-module-Add-AArch64-repo.patch
+++ b/patches/opnfv-fuel/0013-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 f6504ab..1faa164 100644
+index 2211c14..a6dfb6b 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -11,3 +11,4 @@
+@@ -12,3 +12,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/0015-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch
index 5b56848e..a3211d9b 100644
--- a/patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch
+++ b/patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch
@@ -23,7 +23,7 @@ Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
  4 files changed, 14 insertions(+), 14 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 6f1162d..5e9f542 100644
+index 79cea91..1febe8a 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:
@@ -59,7 +59,7 @@ index ad99447..ea95680 100644
      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 7f5a602..4730124 100644
+index 19c7f0b..498cc1d 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:
@@ -74,7 +74,7 @@ index 7f5a602..4730124 100644
  - 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 90e0cf3..c1452b4 100644
+index eff5651..fcec76a 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
 @@ -94,11 +94,11 @@ parameters:
diff --git a/patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch
index 4411df27..7766e323 100644
--- a/patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0017-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/maas b/mcp/config/states/maas
-index 3aafaf5..546a53f 100755
+index c4f59cc..7b3dacc 100755
 --- a/mcp/config/states/maas
 +++ b/mcp/config/states/maas
-@@ -79,6 +79,7 @@ salt -C 'mas01*' pillar.item\
+@@ -81,6 +81,7 @@ salt -C 'mas01*' pillar.item\
  salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
 
  salt -C 'kvm*' pkg.install bridge-utils
@@ -32,7 +32,7 @@ index 3aafaf5..546a53f 100755
  salt -C 'kvm*' state.apply linux.network
  salt -C 'kvm*' state.apply armband.bootstrap_script_arm64
  salt -C 'kvm*' system.reboot
-@@ -102,6 +103,7 @@ while [ $rc -ne 0 ]; do
+@@ -105,6 +106,7 @@ while [ $rc -ne 0 ]; do
    rc=0
    for node in $vcp_nodes; do
      salt "$node" test.ping 2>/dev/null || { rc=$?; break; };
@@ -41,12 +41,13 @@ index 3aafaf5..546a53f 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 28619ba..fd96969 100644
+index 4cb4f2f..16cf4ec 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
-@@ -1,2 +1,6 @@
+@@ -1,3 +1,7 @@
  classes:
  - cluster.all-mcp-ocata-common.opnfv.runtime
+ - cluster.all-mcp-ocata-common.opnfv.pod_config
 +parameters:
 +  _param:
 +    opnfv_user_username: opnfv
diff --git a/patches/opnfv-fuel/0018-pod_config.yml-Use-arm-pod5-specific-config.patch b/patches/opnfv-fuel/0018-pod_config.yml-Use-arm-pod5-specific-config.patch
new file mode 100644
index 00000000..2be76370
--- /dev/null
+++ b/patches/opnfv-fuel/0018-pod_config.yml-Use-arm-pod5-specific-config.patch
@@ -0,0 +1,177 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 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, 19 Sep 2017 16:51:21 +0200
+Subject: [PATCH] pod_config.yml: Use arm-pod5 specific config
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ .../all-mcp-ocata-common/opnfv/pod_config.yml      | 125 +++++++++++----------
+ 1 file changed, 63 insertions(+), 62 deletions(-)
+
+diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml
+index b17816f..0d03712 100644
+--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml
++++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml
+@@ -1,92 +1,93 @@
+ parameters:
+   _param:
+     # infra service addresses
+-    opnfv_infra_config_address: 10.167.4.100
+-    opnfv_infra_config_deploy_address: 10.20.0.2
+-    opnfv_infra_maas_node01_address: 10.167.4.3
++    opnfv_infra_config_address: 172.16.10.100
++    opnfv_infra_maas_node01_address:  172.16.10.3
+     opnfv_infra_maas_node01_deploy_address: 192.168.11.3
+-    opnfv_infra_compute_node01_address: 10.167.4.141
+-    opnfv_infra_compute_node02_address: 10.167.4.142
+-    opnfv_infra_compute_node03_address: 10.167.4.143
+-    opnfv_infra_kvm_address: 10.167.4.140
+-    opnfv_infra_kvm_node01_address: 10.167.4.141
+-    opnfv_infra_kvm_node02_address: 10.167.4.142
+-    opnfv_infra_kvm_node03_address: 10.167.4.143
++    opnfv_infra_compute_node01_address: 172.16.10.141
++    opnfv_infra_compute_node02_address: 172.16.10.142
++    opnfv_infra_compute_node03_address: 172.16.10.143
++    opnfv_infra_kvm_address: 172.16.10.140
++    opnfv_infra_kvm_node01_address: 172.16.10.141
++    opnfv_infra_kvm_node02_address: 172.16.10.142
++    opnfv_infra_kvm_node03_address: 172.16.10.143
+
+-    opnfv_openstack_gateway_node01_address: 10.167.4.124
+-    opnfv_openstack_gateway_node02_address: 10.167.4.125
+-    opnfv_openstack_gateway_node03_address: 10.167.4.126
++    opnfv_openstack_gateway_node01_address: 172.16.10.124
++    opnfv_openstack_gateway_node02_address: 172.16.10.125
++    opnfv_openstack_gateway_node03_address: 172.16.10.126
+     opnfv_openstack_gateway_node01_tenant_address: 10.1.0.6
+     opnfv_openstack_gateway_node02_tenant_address: 10.1.0.7
+     opnfv_openstack_gateway_node03_tenant_address: 10.1.0.9
+-    opnfv_openstack_proxy_address: 10.167.4.80
+-    opnfv_openstack_proxy_node01_address: 10.167.4.81
+-    opnfv_openstack_proxy_node02_address: 10.167.4.82
+-    opnfv_openstack_control_address: 10.167.4.10
+-    opnfv_openstack_control_node01_address: 10.167.4.11
+-    opnfv_openstack_control_node02_address: 10.167.4.12
+-    opnfv_openstack_control_node03_address: 10.167.4.13
+-    opnfv_openstack_database_address: 10.167.4.50
+-    opnfv_openstack_database_node01_address: 10.167.4.51
+-    opnfv_openstack_database_node02_address: 10.167.4.52
+-    opnfv_openstack_database_node03_address: 10.167.4.53
+-    opnfv_openstack_message_queue_address: 10.167.4.40
+-    opnfv_openstack_message_queue_node01_address: 10.167.4.41
+-    opnfv_openstack_message_queue_node02_address: 10.167.4.42
+-    opnfv_openstack_message_queue_node03_address: 10.167.4.43
+-    opnfv_openstack_telemetry_address: 10.167.4.75
+-    opnfv_openstack_telemetry_node01_address: 10.167.4.76
+-    opnfv_openstack_telemetry_node02_address: 10.167.4.77
+-    opnfv_openstack_telemetry_node03_address: 10.167.4.78
+-    opnfv_openstack_compute_node01_single_address: 10.167.4.101
+-    opnfv_openstack_compute_node02_single_address: 10.167.4.102
+-    opnfv_openstack_compute_node03_single_address: 10.167.4.103
+-    opnfv_openstack_compute_node01_control_address: 10.167.4.101
+-    opnfv_openstack_compute_node02_control_address: 10.167.4.102
+-    opnfv_openstack_compute_node03_control_address: 10.167.4.103
++    opnfv_openstack_proxy_address: 172.16.10.80
++    opnfv_openstack_proxy_node01_address: 172.16.10.81
++    opnfv_openstack_proxy_node02_address: 172.16.10.82
++    opnfv_openstack_control_address: 172.16.10.10
++    opnfv_openstack_control_node01_address: 172.16.10.11
++    opnfv_openstack_control_node02_address: 172.16.10.12
++    opnfv_openstack_control_node03_address: 172.16.10.13
++    opnfv_openstack_database_address: 172.16.10.50
++    opnfv_openstack_database_node01_address: 172.16.10.51
++    opnfv_openstack_database_node02_address: 172.16.10.52
++    opnfv_openstack_database_node03_address: 172.16.10.53
++    opnfv_openstack_message_queue_address: 172.16.10.40
++    opnfv_openstack_message_queue_node01_address: 172.16.10.41
++    opnfv_openstack_message_queue_node02_address: 172.16.10.42
++    opnfv_openstack_message_queue_node03_address: 172.16.10.43
++    opnfv_openstack_telemetry_address: 172.16.10.75
++    opnfv_openstack_telemetry_node01_address: 172.16.10.76
++    opnfv_openstack_telemetry_node02_address: 172.16.10.77
++    opnfv_openstack_telemetry_node03_address: 172.16.10.78
++    opnfv_openstack_compute_node01_single_address: 172.16.10.101
++    opnfv_openstack_compute_node02_single_address: 172.16.10.102
++    opnfv_openstack_compute_node03_single_address: 172.16.10.103
++    opnfv_openstack_compute_node01_control_address: 172.16.10.101
++    opnfv_openstack_compute_node02_control_address: 172.16.10.102
++    opnfv_openstack_compute_node03_control_address: 172.16.10.103
+     opnfv_openstack_compute_node01_tenant_address: 10.1.0.101
+     opnfv_openstack_compute_node02_tenant_address: 10.1.0.102
+     opnfv_openstack_compute_node03_tenant_address: 10.1.0.103
+-    opnfv_openstack_compute_node01_external_address: 172.30.10.2
+-    opnfv_openstack_compute_node02_external_address: 172.30.10.3
++    opnfv_openstack_compute_node01_external_address: 10.0.8.101
++    opnfv_openstack_compute_node02_external_address: 10.0.8.102
+
++    # opendaylight options
++    #opnfv_opendaylight_server_node01_single_address: 172.16.10.111
+
+     opnfv_name_servers: ['8.8.8.8', '8.8.4.4']
+     opnfv_dns_server01: '8.8.8.8'
+-    opnfv_net_mgmt_vlan: 300
+-    opnfv_net_tenant_vlan: 302
++    opnfv_net_mgmt_vlan: 2183
++    opnfv_net_tenant_vlan: 2185
+
+-    opnfv_maas_node01_architecture: amd64/generic
+-    opnfv_maas_node01_power_address: 172.30.8.75
++    opnfv_maas_node01_architecture: 'arm64/generic'
++    opnfv_maas_node01_power_address: 10.0.8.3
+     opnfv_maas_node01_power_type: ipmi
+     opnfv_maas_node01_power_user: admin
+-    opnfv_maas_node01_power_password: octopus
+-    opnfv_maas_node01_interface_mac: "00:25:b5:a0:00:2a"
++    opnfv_maas_node01_power_password: admin
++    opnfv_maas_node01_interface_mac: 'e0:ff:f7:00:08:ae'
+
+-    opnfv_maas_node02_architecture: amd64/generic
+-    opnfv_maas_node02_power_address: 172.30.8.65
++    opnfv_maas_node02_architecture: 'arm64/generic'
++    opnfv_maas_node02_power_address: 10.0.8.4
+     opnfv_maas_node02_power_type: ipmi
+     opnfv_maas_node02_power_user: admin
+-    opnfv_maas_node02_power_password: octopus
+-    opnfv_maas_node02_interface_mac: "00:25:b5:a0:00:3a"
++    opnfv_maas_node02_power_password: admin
++    opnfv_maas_node02_interface_mac: 'e0:ff:f7:00:08:b1'
+
+-    opnfv_maas_node03_architecture: amd64/generic
+-    opnfv_maas_node03_power_address: 172.30.8.74
++    opnfv_maas_node03_architecture: 'arm64/generic'
++    opnfv_maas_node03_power_address: 10.0.8.5
+     opnfv_maas_node03_power_type: ipmi
+     opnfv_maas_node03_power_user: admin
+-    opnfv_maas_node03_power_password: octopus
+-    opnfv_maas_node03_interface_mac: "00:25:b5:a0:00:4a"
++    opnfv_maas_node03_power_password: admin
++    opnfv_maas_node03_interface_mac: 'e0:ff:f7:00:08:bd'
+
+-    opnfv_maas_node04_architecture: amd64/generic
+-    opnfv_maas_node04_power_address: 172.30.8.73
++    opnfv_maas_node04_architecture: 'arm64/generic'
++    opnfv_maas_node04_power_address: 10.0.8.6
+     opnfv_maas_node04_power_type: ipmi
+     opnfv_maas_node04_power_user: admin
+-    opnfv_maas_node04_power_password: octopus
+-    opnfv_maas_node04_interface_mac: "00:25:b5:a0:00:5a"
++    opnfv_maas_node04_power_password: admin
++    opnfv_maas_node04_interface_mac: 'e0:ff:f7:00:08:c6'
+
+-    opnfv_maas_node05_architecture: amd64/generic
+-    opnfv_maas_node05_power_address: 172.30.8.72
++    opnfv_maas_node05_architecture: 'arm64/generic'
++    opnfv_maas_node05_power_address: 10.0.8.7
+     opnfv_maas_node05_power_type: ipmi
+     opnfv_maas_node05_power_user: admin
+-    opnfv_maas_node05_power_password: octopus
+-    opnfv_maas_node05_interface_mac: "00:25:b5:a0:00:6a"
++    opnfv_maas_node05_power_password: admin
++    opnfv_maas_node05_interface_mac: 'e0:ff:f7:00:08:cf'
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 2e9fbb20072005831fe96af94b8d1495f5eb30a
+Subproject d1d5c106c09790b85e146874122709e876769c1