p/fuel: Bring in Opendaylight support

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

5 files changed, 600 insertions, 8 deletions

diff --git a/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch b/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch
index cd959da3..e238250c 100644
--- a/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch
+++ b/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch
@@ -7,8 +7,9 @@ While at it, bump default vCPU number from 2 to 6.
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
  mcp/config/scenario/baremetal/defaults.yaml                           | 4 ++--
+ mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml | 2 +-
  mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ 3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/mcp/config/scenario/baremetal/defaults.yaml b/mcp/config/scenario/baremetal/defaults.yaml
 index b841e88..17fbbfc 100644
@@ -23,6 +24,19 @@ index b841e88..17fbbfc 100644
 +    vcpus: 6
      ram: 4096
 
+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 5862ddb..ab14c58 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
+@@ -51,7 +51,7 @@ parameters:
+       address: ${_param:single_address}
+       netmask: 255.255.255.0
+
+-    salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2
++    salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
+     salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
+   linux:
+     network:
 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 e3d47b0..93e2de0 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
diff --git a/patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
index e7ca71d1..08c5b7a6 100644
--- a/patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
+++ b/patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
@@ -20,18 +20,331 @@ is used).
 
 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 +++----
+ .../opendaylight/control.yml                       |  2 +-
+ .../openstack/compute.yml                          | 28 ++++++++--------------
+ .../openstack/control.yml                          |  6 ++---
+ .../openstack/dashboard.yml                        |  4 ++--
+ .../openstack/database.yml                         |  6 ++---
+ .../openstack/message_queue.yml                    |  6 ++---
+ .../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/kvm.yml       | 18 +++++++++-----
  .../baremetal-mcp-ocata-ovs-ha/infra/maas.yml      |  8 +++----
- .../openstack/compute.yml                          | 27 ++++++++--------------
+ .../openstack/compute.yml                          | 27 ++++++++-------------
  .../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 ++---
- 10 files changed, 45 insertions(+), 46 deletions(-)
+ 21 files changed, 91 insertions(+), 94 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 202799f..424a868 100644
+--- 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
+@@ -33,8 +33,8 @@ parameters:
+   linux:
+     network:
+       interface:
+-        ens3: ${_param:linux_dhcp_interface}
+-        ens4: ${_param:linux_single_interface}
++        enp1s0: ${_param:linux_dhcp_interface}
++        enp2s0: ${_param:linux_single_interface}
+   salt:
+     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 7a15156..7c23b68 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:
+     cluster_node03_address: ${_param:infra_kvm_node03_address}
+     keepalived_vip_interface: br-ctl
+     keepalived_vip_virtual_router_id: 69
+-    deploy_nic: enp6s0
++    deploy_nic: eth0
++    trunk_nic: eth1
+   salt:
+     control:
+       size: #RAM 4096,8192,16384,32768,65536
+@@ -123,7 +124,7 @@ parameters:
+   linux:
+     network:
+       interface:
+-        eth3:
++        eth0:
+           enabled: true
+           type: eth
+           proto: manual
+@@ -131,6 +132,11 @@ parameters:
+           netmask: 255.255.255.0
+           name: ${_param:deploy_nic}
+           noifupdown: true
++        eth1:
++          enabled: true
++          type: eth
++          proto: manual
++          name: ${_param:trunk_nic}
+         br-mgmt:
+           enabled: true
+           proto: dhcp
+@@ -141,13 +147,13 @@ parameters:
+           use_interfaces:
+           - ${_param:deploy_nic}
+           noifupdown: true
+-        vlan300:
++        vlan2183:
+           enabled: true
+           proto: manual
+           type: vlan
+-          name: ${_param:deploy_nic}.300
++          name: ${_param:trunk_nic}.2183
+           use_interfaces:
+-          - ${_param:deploy_nic}
++          - ${_param:trunk_nic}
+         br-ctl:
+           enabled: true
+           type: bridge
+@@ -155,4 +161,4 @@ parameters:
+           address: ${_param:single_address}
+           netmask: 255.255.255.0
+           use_interfaces:
+-          - ${_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 c4bc929..5649990 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:
+ - 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
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml
+index 0a01af7..367343a 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml
+@@ -10,7 +10,7 @@ parameters:
+   linux:
+     network:
+       interface:
+-        ens3:
++        enp2s0:
+           enabled: true
+           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 6f0c52c..cd1456a 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
+@@ -20,10 +20,9 @@ parameters:
+     cluster_node03_hostname: ctl03
+     cluster_node03_address: ${_param:openstack_control_node03_address}
+     nova_vncproxy_url: https://${_param:cluster_public_host}:6080
+-    mgmt_nic: enp6s0
+-    tenant_nic: enp7s0
++    mgmt_nic: eth0
++    tenant_nic: eth1
+     linux_system_codename: xenial
+-    external_nic: enp8s0
+     interface_mtu: 1500
+     keepalived_vip_interface: br-ctl
+     keepalived_vip_virtual_router_id: 69
+@@ -57,12 +56,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
+@@ -70,19 +63,19 @@ parameters:
+           netmask: 255.255.255.0
+           mtu: 1500
+           use_interfaces:
+-          - ${_param:tenant_nic}.302
+-        vlan300:
++          - ${_param:tenant_nic}.2185
++        vlan2183:
+           enabled: true
+           proto: manual
+           type: vlan
+-          name: ${_param:mgmt_nic}.300
++          name: ${_param:tenant_nic}.2183
+           use_interfaces:
+-          - ${_param:mgmt_nic}
+-        vlan302:
++          - ${_param:tenant_nic}
++        vlan2185:
+           enabled: true
+           proto: manual
+           type: vlan
+-          name: ${_param:tenant_nic}.302
++          name: ${_param:tenant_nic}.2185
+           use_interfaces:
+           - ${_param:tenant_nic}
+         br-ctl:
+@@ -92,7 +85,7 @@ parameters:
+           address: ${_param:single_address}
+           netmask: 255.255.255.0
+           use_interfaces:
+-          - ${_param:mgmt_nic}.300
++          - ${_param:tenant_nic}.2183
+         br-floating:
+           enabled: true
+           type: ovs_bridge
+@@ -109,7 +102,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-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
+index 227c649..e50b2ce 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
+@@ -23,7 +23,7 @@ classes:
+ - cluster.baremetal-mcp-ocata-odl-ha.infra
+ parameters:
+   _param:
+-    keepalived_vip_interface: ens3
++    keepalived_vip_interface: enp2s0
+     keepalived_vip_virtual_router_id: 50
+     cluster_vip_address: ${_param:openstack_control_address}
+     cluster_local_address: ${_param:single_address}
+@@ -37,8 +37,8 @@ parameters:
+   linux:
+     network:
+       interface:
+-        ens2: ${_param:linux_dhcp_interface}
+-        ens3: ${_param:linux_single_interface}
++        enp1s0: ${_param:linux_dhcp_interface}
++        enp2s0: ${_param:linux_single_interface}
+   neutron:
+     server:
+       backend:
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
+index 9748c4c..a5317b1 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
+@@ -7,5 +7,5 @@ parameters:
+   linux:
+     network:
+       interface:
+-        ens2: ${_param:linux_dhcp_interface}
+-        ens3: ${_param:linux_single_interface}
++        enp1s0: ${_param:linux_dhcp_interface}
++        enp2s0: ${_param:linux_single_interface}
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
+index 6c26d26..d74e5ad 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
+@@ -16,7 +16,7 @@ classes:
+ - cluster.baremetal-mcp-ocata-odl-ha
+ parameters:
+   _param:
+-    keepalived_vip_interface: ens3
++    keepalived_vip_interface: enp2s0
+     keepalived_vip_virtual_router_id: 80
+     galera_server_cluster_name: openstack_cluster
+     cluster_vip_address: ${_param:openstack_database_address}
+@@ -30,5 +30,5 @@ parameters:
+   linux:
+     network:
+       interface:
+-        ens2: ${_param:linux_dhcp_interface}
+-        ens3: ${_param:linux_single_interface}
++        enp1s0: ${_param:linux_dhcp_interface}
++        enp2s0: ${_param:linux_single_interface}
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
+index f5312c1..d2e6a40 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
+@@ -7,7 +7,7 @@ classes:
+ - cluster.baremetal-mcp-ocata-odl-ha
+ parameters:
+   _param:
+-    keepalived_vip_interface: ens3
++    keepalived_vip_interface: enp2s0
+     keepalived_vip_virtual_router_id: 90
+     cluster_vip_address: ${_param:openstack_message_queue_address}
+     cluster_local_address: ${_param:single_address}
+@@ -20,5 +20,5 @@ parameters:
+   linux:
+     network:
+       interface:
+-        ens2: ${_param:linux_dhcp_interface}
+-        ens3: ${_param:linux_single_interface}
++        enp1s0: ${_param:linux_dhcp_interface}
++        enp2s0: ${_param:linux_single_interface}
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
+index 93abf2a..8a62cee 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
+@@ -15,7 +15,7 @@ classes:
+ # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy
+ parameters:
+   _param:
+-    keepalived_vip_interface: ens3
++    keepalived_vip_interface: enp2s0
+     keepalived_vip_virtual_router_id: 240
+     nginx_proxy_ssl:
+       enabled: true
+@@ -27,8 +27,8 @@ parameters:
+   linux:
+     network:
+       interface:
+-        ens2: ${_param:linux_dhcp_interface}
+-        ens3: ${_param:linux_single_interface}
++        enp1s0: ${_param:linux_dhcp_interface}
++        enp2s0: ${_param:linux_single_interface}
+     system:
+       package:
+         libapache2-mod-wsgi:
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
+index 4a56b65..128ec1b 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
+@@ -10,7 +10,7 @@ classes:
+ - cluster.baremetal-mcp-ocata-odl-ha.infra
+ parameters:
+   _param:
+-    keepalived_vip_interface: ens3
++    keepalived_vip_interface: enp2s0
+     keepalived_vip_virtual_router_id: 230
+     cluster_vip_address: ${_param:openstack_telemetry_address}
+     cluster_local_address: ${_param:single_address}
+@@ -23,5 +23,5 @@ parameters:
+   linux:
+     network:
+       interface:
+-        ens2: ${_param:linux_dhcp_interface}
+-        ens3: ${_param:linux_single_interface}
++        enp1s0: ${_param:linux_dhcp_interface}
++        enp2s0: ${_param:linux_single_interface}
 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 ce2c951..7d95ebc 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
diff --git a/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch
index bbfaf5e3..4a159446 100644
--- a/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch
+++ b/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch
@@ -8,9 +8,11 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
  ci/deploy.sh                                       |  2 +-
  mcp/config/states/maas                             |  2 +-
+ .../baremetal-mcp-ocata-odl-ha/infra/init.yml      | 22 ++++----
+ .../baremetal-mcp-ocata-odl-ha/openstack/init.yml  | 62 +++++++++++-----------
  .../baremetal-mcp-ocata-ovs-ha/infra/init.yml      | 22 ++++----
- .../baremetal-mcp-ocata-ovs-ha/openstack/init.yml  | 60 +++++++++++-----------
- 4 files changed, 43 insertions(+), 43 deletions(-)
+ .../baremetal-mcp-ocata-ovs-ha/openstack/init.yml  | 60 ++++++++++-----------
+ 6 files changed, 85 insertions(+), 85 deletions(-)
 
 diff --git a/ci/deploy.sh b/ci/deploy.sh
 index f51ba5f..5582727 100755
@@ -38,6 +40,135 @@ index 1e14e5f..db0241b 100755
 
  wait_for 10 "salt -C 'mas01*' state.apply maas.region"
 
+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 ab14c58..25746b5 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
+@@ -16,19 +16,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: 192.168.10.100
+-    infra_maas_node01_address: 10.167.4.3
+-    infra_maas_node01_deploy_address: 192.168.11.3
+-    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_address: 172.16.10.2
++    infra_maas_node01_deploy_address: 192.168.11.2
++    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-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
+index e49a205..ad99447 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
+@@ -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,26 +36,26 @@ 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
+
+     # opendaylight options
+-    opendaylight_server_node01_single_address: 10.167.4.111
++    opendaylight_server_node01_single_address: 172.16.10.111
+     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 93e2de0..1d75356 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
diff --git a/patches/opnfv-fuel/0011-classes-baremetal-arm-pod3-config-hardcode.patch b/patches/opnfv-fuel/0011-classes-baremetal-arm-pod3-config-hardcode.patch
index 229ea3a0..de9ded82 100644
--- a/patches/opnfv-fuel/0011-classes-baremetal-arm-pod3-config-hardcode.patch
+++ b/patches/opnfv-fuel/0011-classes-baremetal-arm-pod3-config-hardcode.patch
@@ -8,9 +8,92 @@ 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 +++++++++++-----------
- 1 file changed, 20 insertions(+), 20 deletions(-)
+ 2 files changed, 40 insertions(+), 40 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 5649990..e4765ca 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 73215ee..26115fe 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
diff --git a/patches/opnfv-fuel/0015-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0015-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 1a64c6d6..b44bb174 100644
--- a/patches/opnfv-fuel/0015-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0015-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -18,8 +18,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       | 15 ++++++
  .../baremetal-mcp-ocata-ovs-ha/infra/kvm.yml       | 15 ++++++
- 4 files changed, 122 insertions(+)
+ 5 files changed, 137 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,6 +151,56 @@ index a42f513..67b9c82 100644
  /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 7c23b68..395ac02 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,16 +34,25 @@ parameters:
+         openstack.control:
+           cpu: 4
+           ram: 8192
++          hw_firmware_type: uefi
++          virt_machine_model: virt
++          cpu_model: host-passthrough
+           disk_profile: small
+           net_profile: default
+         openstack.database:
+           cpu: 4
+           ram: 8192
++          hw_firmware_type: uefi
++          virt_machine_model: virt
++          cpu_model: host-passthrough
+           disk_profile: large
+           net_profile: default
+         openstack.message_queue:
+           cpu: 4
+           ram: 8192
++          hw_firmware_type: uefi
++          virt_machine_model: virt
++          cpu_model: host-passthrough
+           disk_profile: small
+           net_profile: default
+ #        openstack.telemetry:
+@@ -54,6 +63,9 @@ parameters:
+         openstack.proxy:
+           cpu: 2
+           ram: 4096
++          hw_firmware_type: uefi
++          virt_machine_model: virt
++          cpu_model: host-passthrough
+           disk_profile: small
+           net_profile: default
+ #        stacklight.log:
+@@ -74,6 +86,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 8677a79..914908d 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml