aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-02 21:23:58 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-02 22:49:23 +0000
commit992e94ddcc94eb7222ed0dcf9e2fac5a2c15b464 (patch)
tree1b77a0ef202d37df54d53bc8724551d2ce65ac73
parentc7a7d5b4ea00f043d17c13248cb3aa5f37f2058e (diff)
u/fuel: Bump & rebase for Salt version sync
Change-Id: I5641802152c4e9dc6cec3218848921be5179e815 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 0a09df0d8947bed263541471478049587072f33d)
-rw-r--r--patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch2
-rw-r--r--patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch120
-rw-r--r--patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch2
-rw-r--r--patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch12
-rw-r--r--patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch2
-rw-r--r--patches/opnfv-fuel/0013-aarch64-skip-configuration-of-hugepages.patch8
-rw-r--r--patches/opnfv-fuel/0014-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch8
-rw-r--r--patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch2
m---------upstream/fuel0
9 files changed, 78 insertions, 78 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 8b5b3e7..0afc2d9 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,7 +48,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
create mode 100644 mcp/salt-formulas/armband/vgabios.sls
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
-index aa17e9d..df1f7ed 100755
+index 67ef6d5..ad61b97 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -90,6 +90,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected
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 f331bf8..f6a0355 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
@@ -67,10 +67,10 @@ index 15202f1..6ddb8a2 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 da26254..5e4ea66 100644
+index 67a2c4d..331a262 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
-@@ -26,7 +26,8 @@ parameters:
+@@ -25,7 +25,8 @@ parameters:
cluster_node03_address: ${_param:infra_kvm_node03_address}
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
@@ -80,7 +80,7 @@ index da26254..5e4ea66 100644
salt:
control:
size: # RAM 4096,8192,16384,32768,65536
-@@ -141,7 +142,7 @@ parameters:
+@@ -140,7 +141,7 @@ parameters:
linux:
network:
interface:
@@ -89,7 +89,7 @@ index da26254..5e4ea66 100644
enabled: true
type: eth
proto: manual
-@@ -149,6 +150,11 @@ parameters:
+@@ -148,6 +149,11 @@ parameters:
netmask: 255.255.255.0
name: ${_param:deploy_nic}
noifupdown: true
@@ -101,7 +101,7 @@ index da26254..5e4ea66 100644
br-mgmt:
enabled: true
proto: dhcp
-@@ -161,9 +167,9 @@ parameters:
+@@ -160,9 +166,9 @@ parameters:
enabled: true
proto: manual
type: vlan
@@ -113,17 +113,17 @@ index da26254..5e4ea66 100644
br-ctl:
enabled: true
type: bridge
-@@ -171,4 +177,4 @@ parameters:
+@@ -170,4 +176,4 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
- - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
+ - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
-index 0900b65..a8c6d81 100644
+index 737d6cb..074cadc 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
-@@ -6,9 +6,9 @@ classes:
+@@ -5,9 +5,9 @@ classes:
- cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
_param:
@@ -137,10 +137,10 @@ index 0900b65..a8c6d81 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 d473a07..d77d204 100644
+index ce1bdfd..bbf4453 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
-@@ -11,7 +11,7 @@ parameters:
+@@ -10,7 +10,7 @@ parameters:
linux:
network:
interface:
@@ -150,10 +150,10 @@ index d473a07..d77d204 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 ba0f385..a41df69 100644
+index f2dab39..e2179ee 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
-@@ -25,10 +25,9 @@ parameters:
+@@ -24,10 +24,9 @@ parameters:
cluster_node03_hostname: ctl03
cluster_node03_address: ${_param:openstack_control_node03_address}
nova_vncproxy_url: https://${_param:cluster_public_host}:6080
@@ -166,7 +166,7 @@ index ba0f385..a41df69 100644
interface_mtu: 1500
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
-@@ -78,12 +77,6 @@ parameters:
+@@ -77,12 +76,6 @@ parameters:
type: eth
proto: manual
name: ${_param:tenant_nic}
@@ -179,7 +179,7 @@ index ba0f385..a41df69 100644
br-mesh:
enabled: true
type: bridge
-@@ -96,9 +89,9 @@ parameters:
+@@ -95,9 +88,9 @@ parameters:
enabled: true
proto: manual
type: vlan
@@ -191,7 +191,7 @@ index ba0f385..a41df69 100644
tenant-vlan:
enabled: true
proto: manual
-@@ -113,7 +106,7 @@ parameters:
+@@ -112,7 +105,7 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
@@ -200,7 +200,7 @@ index ba0f385..a41df69 100644
br-floating:
enabled: true
type: ovs_bridge
-@@ -130,6 +123,6 @@ parameters:
+@@ -129,6 +122,6 @@ parameters:
address: ${_param:external_address}
netmask: 255.255.255.0
use_interfaces:
@@ -209,10 +209,10 @@ index ba0f385..a41df69 100644
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 9b72199..c863313 100644
+index b04513f..535de37 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
-@@ -24,7 +24,7 @@ classes:
+@@ -23,7 +23,7 @@ classes:
- cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
_param:
@@ -221,7 +221,7 @@ index 9b72199..c863313 100644
keepalived_vip_virtual_router_id: 50
cluster_vip_address: ${_param:openstack_control_address}
cluster_local_address: ${_param:single_address}
-@@ -38,8 +38,8 @@ parameters:
+@@ -37,8 +37,8 @@ parameters:
linux:
network:
interface:
@@ -245,10 +245,10 @@ index ddcc196..2f56b5a 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 e59c479..66e1905 100644
+index 12fbe91..7e0fd6c 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
-@@ -17,7 +17,7 @@ classes:
+@@ -16,7 +16,7 @@ classes:
- cluster.baremetal-mcp-ocata-odl-ha
parameters:
_param:
@@ -257,7 +257,7 @@ index e59c479..66e1905 100644
keepalived_vip_virtual_router_id: 80
galera_server_cluster_name: openstack_cluster
galera_max_connections: 3072
-@@ -33,5 +33,5 @@ parameters:
+@@ -32,5 +32,5 @@ parameters:
linux:
network:
interface:
@@ -266,10 +266,10 @@ index e59c479..66e1905 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 3c6427c..2ab5489 100644
+index 4bbd92f..25c99da 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
-@@ -8,7 +8,7 @@ classes:
+@@ -7,7 +7,7 @@ classes:
- cluster.baremetal-mcp-ocata-odl-ha
parameters:
_param:
@@ -278,7 +278,7 @@ index 3c6427c..2ab5489 100644
keepalived_vip_virtual_router_id: 90
cluster_vip_address: ${_param:openstack_message_queue_address}
cluster_local_address: ${_param:single_address}
-@@ -21,5 +21,5 @@ parameters:
+@@ -20,5 +20,5 @@ parameters:
linux:
network:
interface:
@@ -287,10 +287,10 @@ index 3c6427c..2ab5489 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 446157d..266b536 100644
+index b8d7109..c3ae104 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
-@@ -18,7 +18,7 @@ classes:
+@@ -17,7 +17,7 @@ classes:
# - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy
parameters:
_param:
@@ -299,7 +299,7 @@ index 446157d..266b536 100644
keepalived_vip_virtual_router_id: 240
nginx_proxy_ssl:
enabled: true
-@@ -30,8 +30,8 @@ parameters:
+@@ -29,8 +29,8 @@ parameters:
linux:
network:
interface:
@@ -311,10 +311,10 @@ index 446157d..266b536 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 e1c969c..920b657 100644
+index 8c4d65a..a6a6fde 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
-@@ -13,7 +13,7 @@ classes:
+@@ -12,7 +12,7 @@ classes:
- cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
_param:
@@ -323,7 +323,7 @@ index e1c969c..920b657 100644
keepalived_vip_virtual_router_id: 230
cluster_vip_address: ${_param:openstack_telemetry_address}
cluster_local_address: ${_param:single_address}
-@@ -26,8 +26,8 @@ parameters:
+@@ -25,8 +25,8 @@ parameters:
linux:
network:
interface:
@@ -350,10 +350,10 @@ index 3966dae..7fd1716 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 9e023e3..95bacb2 100644
+index aa3cb4f..163cf5f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
-@@ -26,7 +26,8 @@ parameters:
+@@ -25,7 +25,8 @@ parameters:
cluster_node03_address: ${_param:infra_kvm_node03_address}
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
@@ -363,7 +363,7 @@ index 9e023e3..95bacb2 100644
salt:
control:
size: # RAM 4096,8192,16384,32768,65536
-@@ -131,7 +132,7 @@ parameters:
+@@ -130,7 +131,7 @@ parameters:
linux:
network:
interface:
@@ -372,7 +372,7 @@ index 9e023e3..95bacb2 100644
enabled: true
type: eth
proto: manual
-@@ -139,6 +140,11 @@ parameters:
+@@ -138,6 +139,11 @@ parameters:
netmask: 255.255.255.0
name: ${_param:deploy_nic}
noifupdown: true
@@ -384,7 +384,7 @@ index 9e023e3..95bacb2 100644
br-mgmt:
enabled: true
proto: dhcp
-@@ -151,9 +157,9 @@ parameters:
+@@ -150,9 +156,9 @@ parameters:
enabled: true
proto: manual
type: vlan
@@ -396,17 +396,17 @@ index 9e023e3..95bacb2 100644
br-ctl:
enabled: true
type: bridge
-@@ -161,4 +167,4 @@ parameters:
+@@ -160,4 +166,4 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
- - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
+ - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
-index bf57837..86b2f94 100644
+index cebc779..b2da07e 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
-@@ -6,9 +6,9 @@ classes:
+@@ -5,9 +5,9 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-ha.infra
parameters:
_param:
@@ -420,10 +420,10 @@ index bf57837..86b2f94 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 ff97fe8..e3f0cff 100644
+index a6fd289..36465cd 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
-@@ -24,9 +24,8 @@ parameters:
+@@ -23,9 +23,8 @@ parameters:
cluster_node03_hostname: ctl03
cluster_node03_address: ${_param:openstack_control_node03_address}
nova_vncproxy_url: https://${_param:cluster_public_host}:6080
@@ -435,7 +435,7 @@ index ff97fe8..e3f0cff 100644
linux_system_codename: xenial
interface_mtu: 1500
keepalived_vip_interface: br-ctl
-@@ -61,12 +60,6 @@ parameters:
+@@ -60,12 +59,6 @@ parameters:
type: eth
proto: manual
name: ${_param:tenant_nic}
@@ -448,7 +448,7 @@ index ff97fe8..e3f0cff 100644
br-mesh:
enabled: true
type: bridge
-@@ -79,9 +72,9 @@ parameters:
+@@ -78,9 +71,9 @@ parameters:
enabled: true
proto: manual
type: vlan
@@ -460,7 +460,7 @@ index ff97fe8..e3f0cff 100644
tenant-vlan:
enabled: true
proto: manual
-@@ -96,7 +89,7 @@ parameters:
+@@ -95,7 +88,7 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
@@ -469,7 +469,7 @@ index ff97fe8..e3f0cff 100644
br-floating:
enabled: true
type: ovs_bridge
-@@ -113,6 +106,6 @@ parameters:
+@@ -112,6 +105,6 @@ parameters:
address: ${_param:external_address}
netmask: 255.255.255.0
use_interfaces:
@@ -478,10 +478,10 @@ index ff97fe8..e3f0cff 100644
use_ovs_ports:
- 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 f0c03cc..aa92d99 100644
+index 5d796eb..ec0f83a 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
-@@ -24,7 +24,7 @@ classes:
+@@ -23,7 +23,7 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-ha.infra
parameters:
_param:
@@ -490,7 +490,7 @@ index f0c03cc..aa92d99 100644
keepalived_vip_virtual_router_id: 50
cluster_vip_address: ${_param:openstack_control_address}
cluster_local_address: ${_param:single_address}
-@@ -38,8 +38,8 @@ parameters:
+@@ -37,8 +37,8 @@ parameters:
linux:
network:
interface:
@@ -514,10 +514,10 @@ index f2e010d..160d69c 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 b8a43d8..b449230 100644
+index 7346f55..561e945 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
-@@ -17,7 +17,7 @@ classes:
+@@ -16,7 +16,7 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-ha
parameters:
_param:
@@ -526,7 +526,7 @@ index b8a43d8..b449230 100644
keepalived_vip_virtual_router_id: 80
galera_server_cluster_name: openstack_cluster
galera_max_connections: 3072
-@@ -33,5 +33,5 @@ parameters:
+@@ -32,5 +32,5 @@ parameters:
linux:
network:
interface:
@@ -535,10 +535,10 @@ index b8a43d8..b449230 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 66b5822..4cd076d 100644
+index 083cf75..d5f5973 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
-@@ -8,7 +8,7 @@ classes:
+@@ -7,7 +7,7 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-ha
parameters:
_param:
@@ -547,7 +547,7 @@ index 66b5822..4cd076d 100644
keepalived_vip_virtual_router_id: 90
cluster_vip_address: ${_param:openstack_message_queue_address}
cluster_local_address: ${_param:single_address}
-@@ -21,5 +21,5 @@ parameters:
+@@ -20,5 +20,5 @@ parameters:
linux:
network:
interface:
@@ -556,10 +556,10 @@ index 66b5822..4cd076d 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 e948d93..b4cf0ca 100644
+index 6e04793..c23331a 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
-@@ -18,7 +18,7 @@ classes:
+@@ -17,7 +17,7 @@ classes:
# - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy
parameters:
_param:
@@ -568,7 +568,7 @@ index e948d93..b4cf0ca 100644
keepalived_vip_virtual_router_id: 240
nginx_proxy_ssl:
enabled: true
-@@ -30,8 +30,8 @@ parameters:
+@@ -29,8 +29,8 @@ parameters:
linux:
network:
interface:
@@ -580,10 +580,10 @@ index e948d93..b4cf0ca 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 4389a49..0f8f467 100644
+index 8254d97..61136bb 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
-@@ -13,7 +13,7 @@ classes:
+@@ -12,7 +12,7 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-ha.infra
parameters:
_param:
@@ -592,7 +592,7 @@ index 4389a49..0f8f467 100644
keepalived_vip_virtual_router_id: 230
cluster_vip_address: ${_param:openstack_telemetry_address}
cluster_local_address: ${_param:single_address}
-@@ -26,8 +26,8 @@ parameters:
+@@ -25,8 +25,8 @@ parameters:
linux:
network:
interface:
diff --git a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index a30322b..6a782a9 100644
--- a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
@@ -29,7 +29,7 @@ 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 df1f7ed..42738e3 100755
+index ad61b97..baa9b13 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -90,7 +90,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected
diff --git a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 844c011..8e4b97b 100644
--- a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -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 5e4ea66..3b717d8 100644
+index 331a262..a328d02 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
-@@ -35,26 +35,41 @@ parameters:
+@@ -34,26 +34,41 @@ parameters:
openstack.control:
cpu: 4
ram: 12288
@@ -205,7 +205,7 @@ index 5e4ea66..3b717d8 100644
disk_profile: small
net_profile: default
# stacklight.log:
-@@ -75,6 +90,9 @@ parameters:
+@@ -74,6 +89,9 @@ parameters:
opendaylight.server:
cpu: 4
ram: 6144
@@ -216,10 +216,10 @@ index 5e4ea66..3b717d8 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 95bacb2..0fa27e3 100644
+index 163cf5f..578979e 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
-@@ -35,21 +35,33 @@ parameters:
+@@ -34,21 +34,33 @@ parameters:
openstack.control:
cpu: 4
ram: 12288
@@ -253,7 +253,7 @@ index 95bacb2..0fa27e3 100644
disk_profile: xxlarge
net_profile: default
# stacklight.log:
-@@ -70,6 +82,9 @@ parameters:
+@@ -69,6 +81,9 @@ parameters:
openstack.proxy:
cpu: 2
ram: 2048
diff --git a/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch
index b232b3d..1f4d0e8 100644
--- a/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch
+++ b/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch
@@ -32,7 +32,7 @@ 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 42738e3..1adccbf 100755
+index baa9b13..68390c0 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -85,6 +85,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
diff --git a/patches/opnfv-fuel/0013-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0013-aarch64-skip-configuration-of-hugepages.patch
index ed9f1fc..396736d 100644
--- a/patches/opnfv-fuel/0013-aarch64-skip-configuration-of-hugepages.patch
+++ b/patches/opnfv-fuel/0013-aarch64-skip-configuration-of-hugepages.patch
@@ -23,10 +23,10 @@ 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 a41df69..10a5a88 100644
+index e2179ee..e4aaba1 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
-@@ -6,8 +6,8 @@ classes:
+@@ -5,8 +5,8 @@ classes:
- system.linux.storage.loopback
- system.glusterfs.client.cluster
- system.nova.compute.cluster
@@ -59,10 +59,10 @@ index c7df472..4db9ee0 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 e3f0cff..6ed1622 100644
+index 36465cd..5c01d2d 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
-@@ -6,8 +6,8 @@ classes:
+@@ -5,8 +5,8 @@ classes:
- system.linux.storage.loopback
- system.glusterfs.client.cluster
- system.nova.compute.cluster
diff --git a/patches/opnfv-fuel/0014-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0014-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
index de1e49c..f3629f8 100644
--- a/patches/opnfv-fuel/0014-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
+++ b/patches/opnfv-fuel/0014-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
@@ -35,10 +35,10 @@ index 4db9ee0..9e37954 100644
key_server: keyserver.ubuntu.com
kernel:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
-index 696c5a5..b90b20b 100644
+index 8db9d13..adf5618 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
-@@ -61,7 +61,7 @@ parameters:
+@@ -60,7 +60,7 @@ parameters:
uca:
# yamllint disable-line rule:line-length
source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
@@ -61,10 +61,10 @@ index 9fa69ba..3f3cdb4 100644
key_server: keyserver.ubuntu.com
kernel:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
-index d072956..e96e091 100644
+index 58cad51..d55406d 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
-@@ -59,7 +59,7 @@ parameters:
+@@ -58,7 +58,7 @@ parameters:
uca:
# yamllint disable-line rule:line-length
source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
diff --git a/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch
index 1f937ca..ebc43d7 100644
--- a/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch
@@ -21,7 +21,7 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
-index 1adccbf..85d1a9e 100755
+index 68390c0..036f76a 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -84,6 +84,7 @@ salt -C 'mas01*' pillar.item\
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 4b2dfa552656def5f56a48229705e79c5c7bcfc
+Subproject 0c00f813d709fd1b65e5dd52abcf16fd81b3d0e