aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-26 05:27:51 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-26 16:11:11 +0000
commit763cf5a07027d8c26b597a40051fd9af8fbe3f81 (patch)
tree394f07dd7ca78a48d81bf23193dd1df57dbb1d8c
parentaff2252078c012c49e713f4dc025e7d911c944a0 (diff)
u/fuel: Bump & rebase for yamllint cleanup
Change-Id: I1144c523596feb64251f08375501cdb73a0d76f6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6dcb09998dae3c3f2a55fc5169fe7dc9010f8a0f)
-rw-r--r--patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch4
-rw-r--r--patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch12
-rw-r--r--patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch215
-rw-r--r--patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch14
-rw-r--r--patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch4
-rw-r--r--patches/opnfv-fuel/0010-mcp-salt-formulas-armband-Extend-libvirt_domain.patch4
-rw-r--r--patches/opnfv-fuel/0011-virtng.py-virt.sls-Extend-libvirt_domain.patch16
-rw-r--r--patches/opnfv-fuel/0012-mcp-salt-formulas-armband-AArch64-bootstrap.patch4
-rw-r--r--patches/opnfv-fuel/0014-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch2
-rw-r--r--patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch76
-rw-r--r--patches/opnfv-fuel/0016-baremetal-odl-Extend-arch-list-for-UCA-repo.patch4
-rw-r--r--patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch14
-rw-r--r--patches/opnfv-fuel/0018-pod_config.yml-Use-arm-pod5-specific-config.patch4
m---------upstream/fuel0
14 files changed, 187 insertions, 186 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 7231d5c..8b5b3e7 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 de9d699..9427112 100755
+index aa17e9d..df1f7ed 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
-@@ -87,6 +87,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected
+@@ -90,6 +90,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/0002-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch
index 78b0524..0e151af 100644
--- a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch
+++ b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch
@@ -63,10 +63,10 @@ index 505153a..bd6e923 100755
+ --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.200 \
--network floating_net --subnet-range ${PUBLIC_NET} floating_subnet"
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
-index 73e2da5..47bf28d 100644
+index 07fada6..fe0714d 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
-@@ -52,13 +52,13 @@ parameters:
+@@ -54,13 +54,13 @@ parameters:
params:
single_address: 172.16.10.105
tenant_address: 10.1.0.105
@@ -84,18 +84,18 @@ index 73e2da5..47bf28d 100644
- external_address: 10.16.0.110
+ external_address: 10.0.9.110
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
-index a14a711..055d98c 100644
+index 8ac2391..bdedfcb 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
-@@ -6,7 +6,7 @@ parameters:
+@@ -7,7 +7,7 @@ parameters:
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_protocol: http
- cluster_public_host: 10.16.0.101
+ cluster_public_host: 10.0.9.101
neutron_public_protocol: http
- neutron_control_dvr: False
- neutron_l3_ha: False
+ neutron_control_dvr: 'False'
+ neutron_l3_ha: 'False'
diff --git a/mcp/scripts/net_public.xml b/mcp/scripts/net_public.xml
index 61650d5..f455480 100644
--- a/mcp/scripts/net_public.xml
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 aafa3c8..6ac5143 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
@@ -29,10 +29,10 @@ 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/kvm.yml | 18 ++++++++++-----
.../baremetal-mcp-ocata-odl-ha/infra/maas.yml | 6 ++---
.../opendaylight/control.yml | 2 +-
- .../openstack/compute.yml | 28 ++++++++--------------
+ .../openstack/compute.yml | 27 ++++++++--------------
.../openstack/control.yml | 6 ++---
.../openstack/dashboard.yml | 4 ++--
.../openstack/database.yml | 6 ++---
@@ -49,13 +49,13 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
.../openstack/message_queue.yml | 6 ++---
.../baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml | 6 ++---
.../openstack/telemetry.yml | 6 ++---
- 21 files changed, 84 insertions(+), 87 deletions(-)
+ 21 files changed, 84 insertions(+), 86 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
+index 4cf2a60..697e697 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:
+@@ -35,8 +35,8 @@ parameters:
linux:
network:
interface:
@@ -67,10 +67,10 @@ 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 e55bcbf..bbdf354 100644
+index 99ac02e..f9427be 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:
+@@ -26,7 +26,8 @@ parameters:
cluster_node03_address: ${_param:infra_kvm_node03_address}
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
@@ -79,8 +79,8 @@ index e55bcbf..bbdf354 100644
+ trunk_nic: eth1
salt:
control:
- size: #RAM 4096,8192,16384,32768,65536
-@@ -139,7 +140,7 @@ parameters:
+ size: # RAM 4096,8192,16384,32768,65536
+@@ -141,7 +142,7 @@ parameters:
linux:
network:
interface:
@@ -89,7 +89,7 @@ index e55bcbf..bbdf354 100644
enabled: true
type: eth
proto: manual
-@@ -147,6 +148,11 @@ parameters:
+@@ -149,6 +150,11 @@ parameters:
netmask: 255.255.255.0
name: ${_param:deploy_nic}
noifupdown: true
@@ -101,9 +101,9 @@ index e55bcbf..bbdf354 100644
br-mgmt:
enabled: true
proto: dhcp
-@@ -157,13 +163,13 @@ parameters:
+@@ -159,13 +165,13 @@ parameters:
use_interfaces:
- - ${_param:deploy_nic}
+ - ${_param:deploy_nic}
noifupdown: true
- vlan300:
+ vlan2183:
@@ -113,23 +113,23 @@ index e55bcbf..bbdf354 100644
- name: ${_param:deploy_nic}.300
+ name: ${_param:trunk_nic}.2183
use_interfaces:
-- - ${_param:deploy_nic}
-+ - ${_param:trunk_nic}
+- - ${_param:deploy_nic}
++ - ${_param:trunk_nic}
br-ctl:
enabled: true
type: bridge
-@@ -171,4 +177,4 @@ parameters:
+@@ -173,4 +179,4 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
-- - ${_param:deploy_nic}.300
-+ - ${_param:trunk_nic}.2183
+- - ${_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 64ae85a..40d9c2d 100644
+index 2a2fedb..cb98e0e 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,9 +4,9 @@ classes:
- - cluster.baremetal-mcp-ocata-odl-ha.infra
+@@ -5,9 +5,9 @@ classes:
+ - cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
_param:
- dhcp_interface: ens3
@@ -142,10 +142,10 @@ index 64ae85a..40d9c2d 100644
# 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
+index d473a07..d77d204 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:
+@@ -11,7 +11,7 @@ parameters:
linux:
network:
interface:
@@ -155,10 +155,10 @@ 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 d2495c2..79cea91 100644
+index 82b1a6e..605bfe1 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:
+@@ -25,10 +25,9 @@ parameters:
cluster_node03_hostname: ctl03
cluster_node03_address: ${_param:openstack_control_node03_address}
nova_vncproxy_url: https://${_param:cluster_public_host}:6080
@@ -171,7 +171,7 @@ index d2495c2..79cea91 100644
interface_mtu: 1500
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
-@@ -76,12 +75,6 @@ parameters:
+@@ -78,12 +77,6 @@ parameters:
type: eth
proto: manual
name: ${_param:tenant_nic}
@@ -184,13 +184,13 @@ index d2495c2..79cea91 100644
br-mesh:
enabled: true
type: bridge
-@@ -89,19 +82,19 @@ parameters:
+@@ -91,19 +84,19 @@ parameters:
netmask: 255.255.255.0
mtu: 1500
use_interfaces:
-- - ${_param:tenant_nic}.302
+- - ${_param:tenant_nic}.302
- vlan300:
-+ - ${_param:tenant_nic}.2185
++ - ${_param:tenant_nic}.2185
+ vlan2183:
enabled: true
proto: manual
@@ -198,9 +198,9 @@ index d2495c2..79cea91 100644
- name: ${_param:mgmt_nic}.300
+ name: ${_param:tenant_nic}.2183
use_interfaces:
-- - ${_param:mgmt_nic}
+- - ${_param:mgmt_nic}
- vlan302:
-+ - ${_param:tenant_nic}
++ - ${_param:tenant_nic}
+ vlan2185:
enabled: true
proto: manual
@@ -208,32 +208,31 @@ index d2495c2..79cea91 100644
- name: ${_param:tenant_nic}.302
+ name: ${_param:tenant_nic}.2185
use_interfaces:
- - ${_param:tenant_nic}
+ - ${_param:tenant_nic}
br-ctl:
-@@ -111,7 +104,7 @@ parameters:
+@@ -113,7 +106,7 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
-- - ${_param:mgmt_nic}.300
-+ - ${_param:tenant_nic}.2183
+- - ${_param:mgmt_nic}.300
++ - ${_param:tenant_nic}.2183
br-floating:
enabled: true
type: ovs_bridge
-@@ -128,7 +121,6 @@ parameters:
+@@ -130,6 +123,6 @@ parameters:
address: ${_param:external_address}
netmask: 255.255.255.0
use_interfaces:
-- - ${_param:external_nic}
-+ - ${_param:tenant_nic}
+- - ${_param:external_nic}
++ - ${_param:tenant_nic}
use_ovs_ports:
- - float-to-ex
--
+ - 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 b46e23d..040ea2c 100644
+index 9b72199..c863313 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
+@@ -24,7 +24,7 @@ classes:
+ - cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
_param:
- keepalived_vip_interface: ens3
@@ -241,7 +240,7 @@ index b46e23d..040ea2c 100644
keepalived_vip_virtual_router_id: 50
cluster_vip_address: ${_param:openstack_control_address}
cluster_local_address: ${_param:single_address}
-@@ -37,8 +37,8 @@ parameters:
+@@ -38,8 +38,8 @@ parameters:
linux:
network:
interface:
@@ -253,10 +252,10 @@ index b46e23d..040ea2c 100644
server:
cacert: /etc/ssl/certs/mcp_os_cacert
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
+index ddcc196..2f56b5a 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:
+@@ -8,5 +8,5 @@ parameters:
linux:
network:
interface:
@@ -265,11 +264,11 @@ index 9748c4c..a5317b1 100644
+ 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 e61a469..03df92c 100644
+index e59c479..66e1905 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
+@@ -17,7 +17,7 @@ classes:
+ - cluster.baremetal-mcp-ocata-odl-ha
parameters:
_param:
- keepalived_vip_interface: ens3
@@ -277,7 +276,7 @@ index e61a469..03df92c 100644
keepalived_vip_virtual_router_id: 80
galera_server_cluster_name: openstack_cluster
galera_max_connections: 3072
-@@ -32,5 +32,5 @@ parameters:
+@@ -33,5 +33,5 @@ parameters:
linux:
network:
interface:
@@ -286,11 +285,11 @@ index e61a469..03df92c 100644
+ 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
+index 3c6427c..2ab5489 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
+@@ -8,7 +8,7 @@ classes:
+ - cluster.baremetal-mcp-ocata-odl-ha
parameters:
_param:
- keepalived_vip_interface: ens3
@@ -298,7 +297,7 @@ index f5312c1..d2e6a40 100644
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:
+@@ -21,5 +21,5 @@ parameters:
linux:
network:
interface:
@@ -307,11 +306,11 @@ index f5312c1..d2e6a40 100644
+ 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 89a1930..6e542b0 100644
+index 446157d..266b536 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
-@@ -17,7 +17,7 @@ classes:
- # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy
+@@ -18,7 +18,7 @@ classes:
+ # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy
parameters:
_param:
- keepalived_vip_interface: ens3
@@ -319,7 +318,7 @@ index 89a1930..6e542b0 100644
keepalived_vip_virtual_router_id: 240
nginx_proxy_ssl:
enabled: true
-@@ -29,8 +29,8 @@ parameters:
+@@ -30,8 +30,8 @@ parameters:
linux:
network:
interface:
@@ -331,11 +330,11 @@ index 89a1930..6e542b0 100644
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 4e90090..c08f209 100644
+index e1c969c..920b657 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
-@@ -12,7 +12,7 @@ classes:
- - cluster.baremetal-mcp-ocata-odl-ha.infra
+@@ -13,7 +13,7 @@ classes:
+ - cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
_param:
- keepalived_openstack_telemetry_vip_interface: ens3
@@ -343,7 +342,7 @@ index 4e90090..c08f209 100644
keepalived_vip_virtual_router_id: 230
cluster_vip_address: ${_param:openstack_telemetry_address}
cluster_local_address: ${_param:single_address}
-@@ -25,8 +25,8 @@ parameters:
+@@ -26,8 +26,8 @@ parameters:
linux:
network:
interface:
@@ -355,10 +354,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 4520621..40b62d4 100644
+index 3966dae..7fd1716 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
-@@ -31,8 +31,8 @@ parameters:
+@@ -33,8 +33,8 @@ parameters:
linux:
network:
interface:
@@ -370,10 +369,10 @@ index 4520621..40b62d4 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 3e9879b..0ae3f4d 100644
+index 9e023e3..95bacb2 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:
+@@ -26,7 +26,8 @@ parameters:
cluster_node03_address: ${_param:infra_kvm_node03_address}
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
@@ -382,7 +381,7 @@ index 3e9879b..0ae3f4d 100644
+ trunk_nic: eth1
salt:
control:
- size: #RAM 4096,8192,16384,32768,65536
+ size: # RAM 4096,8192,16384,32768,65536
@@ -131,7 +132,7 @@ parameters:
linux:
network:
@@ -411,8 +410,8 @@ index 3e9879b..0ae3f4d 100644
- 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}
+- - ${_param:deploy_nic}
++ - ${_param:trunk_nic}
br-ctl:
enabled: true
type: bridge
@@ -420,14 +419,14 @@ index 3e9879b..0ae3f4d 100644
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
-- - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
-+ - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
+- - ${_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 3a98fac..799e31f 100644
+index 2922fa3..99ca6ce 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,9 +4,9 @@ classes:
- - cluster.baremetal-mcp-ocata-ovs-ha.infra
+@@ -5,9 +5,9 @@ classes:
+ - cluster.baremetal-mcp-ocata-ovs-ha.infra
parameters:
_param:
- dhcp_interface: ens3
@@ -440,10 +439,10 @@ index 3a98fac..799e31f 100644
# 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 fca4065..19c7f0b 100644
+index ff97fe8..e3f0cff 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:
+@@ -24,9 +24,8 @@ parameters:
cluster_node03_hostname: ctl03
cluster_node03_address: ${_param:openstack_control_node03_address}
nova_vncproxy_url: https://${_param:cluster_public_host}:6080
@@ -455,7 +454,7 @@ index fca4065..19c7f0b 100644
linux_system_codename: xenial
interface_mtu: 1500
keepalived_vip_interface: br-ctl
-@@ -59,12 +58,6 @@ parameters:
+@@ -61,12 +60,6 @@ parameters:
type: eth
proto: manual
name: ${_param:tenant_nic}
@@ -468,41 +467,41 @@ index fca4065..19c7f0b 100644
br-mesh:
enabled: true
type: bridge
-@@ -77,9 +70,9 @@ parameters:
+@@ -79,9 +72,9 @@ parameters:
enabled: true
proto: manual
type: vlan
- name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
+ name: ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
use_interfaces:
-- - ${_param:mgmt_nic}
-+ - ${_param:tenant_nic}
+- - ${_param:mgmt_nic}
++ - ${_param:tenant_nic}
tenant-vlan:
enabled: true
proto: manual
-@@ -94,7 +87,7 @@ parameters:
+@@ -96,7 +89,7 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
-- - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
-+ - ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
+- - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
++ - ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
br-floating:
enabled: true
type: ovs_bridge
-@@ -111,6 +104,6 @@ parameters:
+@@ -113,6 +106,6 @@ parameters:
address: ${_param:external_address}
netmask: 255.255.255.0
use_interfaces:
-- - ${_param:external_nic}
-+ - ${_param:tenant_nic}
+- - ${_param:external_nic}
++ - ${_param:tenant_nic}
use_ovs_ports:
- - float-to-ex
+ - float-to-ex
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
-index 1711ab0..0571320 100644
+index f0c03cc..aa92d99 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
-@@ -23,7 +23,7 @@ classes:
- - cluster.baremetal-mcp-ocata-ovs-ha.infra
+@@ -24,7 +24,7 @@ classes:
+ - cluster.baremetal-mcp-ocata-ovs-ha.infra
parameters:
_param:
- keepalived_vip_interface: ens3
@@ -510,7 +509,7 @@ index 1711ab0..0571320 100644
keepalived_vip_virtual_router_id: 50
cluster_vip_address: ${_param:openstack_control_address}
cluster_local_address: ${_param:single_address}
-@@ -37,8 +37,8 @@ parameters:
+@@ -38,8 +38,8 @@ parameters:
linux:
network:
interface:
@@ -522,10 +521,10 @@ index 1711ab0..0571320 100644
server:
cacert: /etc/ssl/certs/mcp_os_cacert
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
-index 39cc073..18f622c 100644
+index f2e010d..160d69c 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
-@@ -7,5 +7,5 @@ parameters:
+@@ -8,5 +8,5 @@ parameters:
linux:
network:
interface:
@@ -534,11 +533,11 @@ index 39cc073..18f622c 100644
+ enp1s0: ${_param:linux_dhcp_interface}
+ enp2s0: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
-index 4cb7397..c431ae0 100644
+index b8a43d8..b449230 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
-@@ -16,7 +16,7 @@ classes:
- - cluster.baremetal-mcp-ocata-ovs-ha
+@@ -17,7 +17,7 @@ classes:
+ - cluster.baremetal-mcp-ocata-ovs-ha
parameters:
_param:
- keepalived_vip_interface: ens3
@@ -546,7 +545,7 @@ index 4cb7397..c431ae0 100644
keepalived_vip_virtual_router_id: 80
galera_server_cluster_name: openstack_cluster
galera_max_connections: 3072
-@@ -32,5 +32,5 @@ parameters:
+@@ -33,5 +33,5 @@ parameters:
linux:
network:
interface:
@@ -555,11 +554,11 @@ index 4cb7397..c431ae0 100644
+ enp1s0: ${_param:linux_dhcp_interface}
+ enp2s0: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
-index 881644b..f510a7b 100644
+index 66b5822..4cd076d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
-@@ -7,7 +7,7 @@ classes:
- - cluster.baremetal-mcp-ocata-ovs-ha
+@@ -8,7 +8,7 @@ classes:
+ - cluster.baremetal-mcp-ocata-ovs-ha
parameters:
_param:
- keepalived_vip_interface: ens3
@@ -567,7 +566,7 @@ index 881644b..f510a7b 100644
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:
+@@ -21,5 +21,5 @@ parameters:
linux:
network:
interface:
@@ -576,11 +575,11 @@ index 881644b..f510a7b 100644
+ enp1s0: ${_param:linux_dhcp_interface}
+ enp2s0: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
-index 5e9a2c5..939fd7f 100644
+index e948d93..b4cf0ca 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
-@@ -17,7 +17,7 @@ classes:
- # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy
+@@ -18,7 +18,7 @@ classes:
+ # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy
parameters:
_param:
- keepalived_vip_interface: ens3
@@ -588,7 +587,7 @@ index 5e9a2c5..939fd7f 100644
keepalived_vip_virtual_router_id: 240
nginx_proxy_ssl:
enabled: true
-@@ -29,8 +29,8 @@ parameters:
+@@ -30,8 +30,8 @@ parameters:
linux:
network:
interface:
@@ -600,11 +599,11 @@ index 5e9a2c5..939fd7f 100644
package:
libapache2-mod-wsgi:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
-index 0e3c7bd..9702576 100644
+index 4389a49..0f8f467 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
-@@ -12,7 +12,7 @@ classes:
- - cluster.baremetal-mcp-ocata-ovs-ha.infra
+@@ -13,7 +13,7 @@ classes:
+ - cluster.baremetal-mcp-ocata-ovs-ha.infra
parameters:
_param:
- keepalived_openstack_telemetry_vip_interface: ens3
@@ -612,7 +611,7 @@ index 0e3c7bd..9702576 100644
keepalived_vip_virtual_router_id: 230
cluster_vip_address: ${_param:openstack_telemetry_address}
cluster_local_address: ${_param:single_address}
-@@ -25,8 +25,8 @@ parameters:
+@@ -26,8 +26,8 @@ parameters:
linux:
network:
interface:
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 f64726d..e235d86 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
@@ -17,10 +17,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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 29b2521..fe264ce 100644
+index b1cd5d2..50c590d 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,18 +17,18 @@ parameters:
+@@ -18,18 +18,18 @@ parameters:
infra_maas_database_password: opnfv_secret
# infra service addresses
@@ -49,10 +49,10 @@ index 29b2521..fe264ce 100644
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
+index 16bdc06..e288322 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:
+@@ -4,9 +4,9 @@ parameters:
openstack_version: ocata
@@ -65,7 +65,7 @@ index e49a205..ad99447 100644
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:
+@@ -15,21 +15,21 @@ parameters:
openstack_gateway_node03_hostname: gtw03
# openstack service addresses
@@ -102,7 +102,7 @@ index e49a205..ad99447 100644
openstack_telemetry_hostname: mdb
-@@ -36,26 +36,26 @@ parameters:
+@@ -37,26 +37,26 @@ parameters:
openstack_telemetry_node02_hostname: mdb02
openstack_telemetry_node03_hostname: mdb03
@@ -139,6 +139,6 @@ index e49a205..ad99447 100644
# opendaylight options
- opendaylight_server_node01_single_address: 10.167.4.111
+ opendaylight_server_node01_single_address: 172.16.10.111
+ # yamllint disable rule:line-length
opendaylight_service_host: ${_param:opendaylight_server_node01_single_address}
opendaylight_server_node01_hostname: odl01
- opendaylight_router: odl-router_v2
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 f915929..f4db612 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
@@ -20,10 +20,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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 40d9c2d..b6735fc 100644
+index cb98e0e..ebee892 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
-@@ -47,57 +47,57 @@ parameters:
+@@ -48,57 +48,57 @@ parameters:
machines:
kvm01:
interface:
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 eb5931a..a30322b 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 9427112..ca476c5 100755
+index df1f7ed..42738e3 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
-@@ -87,7 +87,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected
+@@ -90,7 +90,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 ea2007e..d61b810 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
@@ -160,10 +160,10 @@ index 4d75677..2211c14 100644
+/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 bbdf354..06a5d0c 100644
+index f9427be..a5cc5b0 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:
+@@ -35,26 +35,41 @@ parameters:
openstack.control:
cpu: 4
ram: 12288
@@ -204,8 +204,8 @@ index bbdf354..06a5d0c 100644
+ cpu_model: host-passthrough
disk_profile: small
net_profile: default
- # stacklight.log:
-@@ -74,6 +89,9 @@ parameters:
+ # stacklight.log:
+@@ -75,6 +90,9 @@ parameters:
opendaylight.server:
cpu: 4
ram: 6144
@@ -216,10 +216,10 @@ index bbdf354..06a5d0c 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 0ae3f4d..4243d91 100644
+index 95bacb2..0fa27e3 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:
+@@ -35,21 +35,33 @@ parameters:
openstack.control:
cpu: 4
ram: 12288
@@ -252,6 +252,8 @@ index 0ae3f4d..4243d91 100644
+ cpu_model: host-passthrough
disk_profile: xxlarge
net_profile: default
+ # stacklight.log:
+@@ -70,6 +82,9 @@ parameters:
openstack.proxy:
cpu: 2
ram: 2048
@@ -260,4 +262,4 @@ index 0ae3f4d..4243d91 100644
+ cpu_model: host-passthrough
disk_profile: small
net_profile: default
- # stacklight.log:
+ cluster:
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 f9d7381..b232b3d 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 ca476c5..c4f59cc 100755
+index 42738e3..1adccbf 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
-@@ -82,6 +82,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
+@@ -85,6 +85,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/0014-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0014-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
index f0dfece..d6c0b9d 100644
--- a/patches/opnfv-fuel/0014-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
+++ b/patches/opnfv-fuel/0014-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
@@ -31,7 +31,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
1 file changed, 10 insertions(+)
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
-index 650c63b..3438cb4 100644
+index 4b88ab7..90ab8c5 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -28,6 +28,15 @@ get_base_image() {
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 a3211d9..53abfc4 100644
--- a/patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch
+++ b/patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch
@@ -23,25 +23,25 @@ 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 79cea91..1febe8a 100644
+index 605bfe1..51f5635 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
-@@ -5,8 +5,8 @@ classes:
- - system.linux.storage.loopback
- - system.glusterfs.client.cluster
- - system.nova.compute.cluster
--- system.nova.compute.nfv.hugepages
--- system.nova.compute.nfv.cpu_pinning
-+#- system.nova.compute.nfv.hugepages
-+#- system.nova.compute.nfv.cpu_pinning
- - system.neutron.gateway.opendaylight.single
- - system.neutron.gateway.cluster
- - system.cinder.volume.single
+@@ -6,8 +6,8 @@ classes:
+ - system.linux.storage.loopback
+ - system.glusterfs.client.cluster
+ - system.nova.compute.cluster
+- - system.nova.compute.nfv.hugepages
+- - system.nova.compute.nfv.cpu_pinning
++ # - system.nova.compute.nfv.hugepages
++ # - system.nova.compute.nfv.cpu_pinning
+ - system.neutron.gateway.opendaylight.single
+ - system.neutron.gateway.cluster
+ - system.cinder.volume.single
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-index ad99447..ea95680 100644
+index e288322..a40d23e 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
-@@ -100,11 +100,11 @@ parameters:
+@@ -102,11 +102,11 @@ parameters:
rabbitmq_secret_key: opnfv_secret
rabbitmq_admin_password: opnfv_secret
rabbitmq_openstack_password: opnfv_secret
@@ -50,34 +50,34 @@ index ad99447..ea95680 100644
- compute_hugepages_count: 16
- compute_hugepages_mount: /mnt/hugepages_1G
- compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
-+ #nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
-+ #compute_hugepages_size: 1G
-+ #compute_hugepages_count: 16
-+ #compute_hugepages_mount: /mnt/hugepages_1G
-+ #compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
++ # nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
++ # compute_hugepages_size: 1G
++ # compute_hugepages_count: 16
++ # compute_hugepages_mount: /mnt/hugepages_1G
++ # compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:openstack_control_address}
keystone_version: ${_param:openstack_version}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
-index 19c7f0b..498cc1d 100644
+index e3f0cff..6ed1622 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:
- - system.linux.storage.loopback
- - system.glusterfs.client.cluster
- - system.nova.compute.cluster
--- system.nova.compute.nfv.hugepages
--- system.nova.compute.nfv.cpu_pinning
-+#- system.nova.compute.nfv.hugepages
-+#- system.nova.compute.nfv.cpu_pinning
- - system.neutron.gateway.cluster
- - system.cinder.volume.single
- - system.cinder.volume.backend.lvm
+@@ -6,8 +6,8 @@ classes:
+ - system.linux.storage.loopback
+ - system.glusterfs.client.cluster
+ - system.nova.compute.cluster
+- - system.nova.compute.nfv.hugepages
+- - system.nova.compute.nfv.cpu_pinning
++ # - system.nova.compute.nfv.hugepages
++ # - system.nova.compute.nfv.cpu_pinning
+ - system.neutron.gateway.cluster
+ - system.cinder.volume.single
+ - system.cinder.volume.backend.lvm
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
-index eff5651..fcec76a 100644
+index 7ce282b..9401f60 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
-@@ -94,11 +94,11 @@ parameters:
+@@ -96,11 +96,11 @@ parameters:
rabbitmq_secret_key: opnfv_secret
rabbitmq_admin_password: opnfv_secret
rabbitmq_openstack_password: opnfv_secret
@@ -86,11 +86,11 @@ index eff5651..fcec76a 100644
- compute_hugepages_count: 16
- compute_hugepages_mount: /mnt/hugepages_1G
- compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
-+ # nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
-+ # compute_hugepages_size: 1G
-+ # compute_hugepages_count: 16
-+ # compute_hugepages_mount: /mnt/hugepages_1G
-+ # compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
++ # nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
++ # compute_hugepages_size: 1G
++ # compute_hugepages_count: 16
++ # compute_hugepages_mount: /mnt/hugepages_1G
++ # compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:openstack_control_address}
keystone_version: ${_param:openstack_version}
diff --git a/patches/opnfv-fuel/0016-baremetal-odl-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0016-baremetal-odl-Extend-arch-list-for-UCA-repo.patch
index 8f10da2..2a852d8 100644
--- a/patches/opnfv-fuel/0016-baremetal-odl-Extend-arch-list-for-UCA-repo.patch
+++ b/patches/opnfv-fuel/0016-baremetal-odl-Extend-arch-list-for-UCA-repo.patch
@@ -18,10 +18,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
1 file changed, 1 insertion(+), 1 deletion(-)
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 ea95680..9b39962 100644
+index a40d23e..8590fb8 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
-@@ -201,7 +201,7 @@ parameters:
+@@ -203,7 +203,7 @@ parameters:
repo:
uca:
source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
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 7766e32..1f937ca 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 c4f59cc..7b3dacc 100755
+index 1adccbf..85d1a9e 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
-@@ -81,6 +81,7 @@ salt -C 'mas01*' pillar.item\
+@@ -84,6 +84,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 c4f59cc..7b3dacc 100755
salt -C 'kvm*' state.apply linux.network
salt -C 'kvm*' state.apply armband.bootstrap_script_arm64
salt -C 'kvm*' system.reboot
-@@ -105,6 +106,7 @@ while [ $rc -ne 0 ]; do
+@@ -108,6 +109,7 @@ while [ $rc -ne 0 ]; do
rc=0
for node in $vcp_nodes; do
salt "$node" test.ping 2>/dev/null || { rc=$?; break; };
@@ -41,13 +41,13 @@ index c4f59cc..7b3dacc 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 4cb4f2f..16cf4ec 100644
+index c9be2c2..5c84ec6 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,3 +1,7 @@
+@@ -2,3 +2,7 @@
classes:
- - cluster.all-mcp-ocata-common.opnfv.runtime
- - cluster.all-mcp-ocata-common.opnfv.pod_config
+ - 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
index 2be7637..5134313 100644
--- 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
@@ -16,10 +16,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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
+index 90c3c85..68b048f 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 @@
+@@ -2,92 +2,93 @@
parameters:
_param:
# infra service addresses
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 91a3426ee125951d54d7e80ee8c133168221fcb
+Subproject 533b81df35acd7c2f16cd347cf3167583e870d3