aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-29 20:11:31 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-29 20:12:48 +0200
commit26be4fb77af34a001f01d0f3a01bbf8bf6040877 (patch)
tree4981a55539c222d849ff6935bcf44efce7d8efed /patches/opnfv-fuel
parent35d4faa69ebc0f48520af4c5ffe7fca78854a68c (diff)
p/fuel: Rebase after wrap of common virtual config
Change-Id: I1fd6e63385cfa158b35fa544e1cbb65b6d858c34 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel')
-rw-r--r--patches/opnfv-fuel/0003-classes-virtual-AArch64-virtio-NIC-names-sync.patch321
-rw-r--r--patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch6
-rw-r--r--patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch83
-rw-r--r--patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch12
-rw-r--r--patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch4
-rw-r--r--patches/opnfv-fuel/0018-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch4
-rw-r--r--patches/opnfv-fuel/0022-lib.sh-Reuse-tmp-mcp.rsa-if-present.patch2
7 files changed, 102 insertions, 330 deletions
diff --git a/patches/opnfv-fuel/0003-classes-virtual-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0003-classes-virtual-AArch64-virtio-NIC-names-sync.patch
index d62448f..8465208 100644
--- a/patches/opnfv-fuel/0003-classes-virtual-AArch64-virtio-NIC-names-sync.patch
+++ b/patches/opnfv-fuel/0003-classes-virtual-AArch64-virtio-NIC-names-sync.patch
@@ -20,58 +20,23 @@ is used).
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
+ .../cluster/virtual-mcp-ocata-common/openstack_compute.yml | 8 ++++----
+ .../cluster/virtual-mcp-ocata-common/openstack_control.yml | 4 ++--
+ .../cluster/virtual-mcp-ocata-common/openstack_gateway.yml | 8 ++++----
.../classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml | 2 +-
.../cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml | 2 +-
- .../cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml | 8 ++++----
- .../cluster/virtual-mcp-ocata-odl-router/openstack/control.yml | 4 ++--
- .../cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml | 8 ++++----
.../classes/cluster/virtual-mcp-ocata-odl/infra/config.yml | 2 +-
.../cluster/virtual-mcp-ocata-odl/opendaylight/control.yml | 2 +-
- .../classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml | 8 ++++----
- .../classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml | 4 ++--
- .../classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml | 8 ++++----
.../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml | 6 +++---
- .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml | 8 ++++----
- .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml | 4 ++--
- .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml | 8 ++++----
.../classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml | 2 +-
- .../classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml | 8 ++++----
- .../classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml | 4 ++--
- .../classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml | 8 ++++----
- 18 files changed, 48 insertions(+), 48 deletions(-)
+ 9 files changed, 18 insertions(+), 18 deletions(-)
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
-index 63e58a2..2f8e94a 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
-@@ -27,7 +27,7 @@ parameters:
- linux:
- network:
- interface:
-- ens4:
-+ enp2s0:
- enabled: true
- type: eth
- proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
-index 6bc0f51..4dacc73 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
-@@ -10,7 +10,7 @@ parameters:
- linux:
- network:
- interface:
-- ens4:
-+ enp2s0:
- enabled: true
- type: eth
- proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
-index ba710a3..0c1a91f 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
-@@ -10,9 +10,9 @@ classes:
- - cluster.virtual-mcp-ocata-odl-router
+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 0cb7ccb..808fbab 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
+@@ -12,9 +12,9 @@ classes:
+ - system.ceilometer.client.cinder_volume
parameters:
_param:
- primary_interface: ens4
@@ -83,7 +48,7 @@ index ba710a3..0c1a91f 100644
interface_mtu: 9000
linux_system_codename: xenial
loopback_device_size: 10
-@@ -54,7 +54,7 @@ parameters:
+@@ -50,7 +50,7 @@ parameters:
interface:
dhcp_int:
enabled: true
@@ -92,11 +57,11 @@ index ba710a3..0c1a91f 100644
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml
-index 4d31b09..1ea653a 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml
-@@ -40,13 +40,13 @@ parameters:
+diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
+index 0927900..69fedb6 100644
+--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
+@@ -48,13 +48,13 @@ parameters:
version: latest
network:
interface:
@@ -112,12 +77,12 @@ index 4d31b09..1ea653a 100644
enabled: true
type: eth
proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml
-index fee8097..f6173d0 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml
-@@ -6,9 +6,9 @@ classes:
- - cluster.virtual-mcp-ocata-odl-router
+diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
+index 9262590..f5479fc 100644
+--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
+@@ -4,9 +4,9 @@ classes:
+ - system.linux.system.repo.saltstack.xenial
parameters:
_param:
- primary_interface: ens4
@@ -128,8 +93,8 @@ index fee8097..f6173d0 100644
+ external_interface: enp4s0
interface_mtu: 9000
linux_system_codename: xenial
- neutron_agents:
-@@ -33,7 +33,7 @@ parameters:
+ neutron:
+@@ -19,7 +19,7 @@ parameters:
interface:
dhcp_int:
enabled: true
@@ -138,10 +103,10 @@ index fee8097..f6173d0 100644
proto: dhcp
type: eth
mtu: ${_param:interface_mtu}
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
-index 328d6df..57c6cec 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
+diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
+index 63e58a2..2f8e94a 100644
+--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
@@ -27,7 +27,7 @@ parameters:
linux:
network:
@@ -151,10 +116,10 @@ index 328d6df..57c6cec 100644
enabled: true
type: eth
proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
-index 38431a5..066488b 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
+diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
+index 6bc0f51..4dacc73 100644
+--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
@@ -10,7 +10,7 @@ parameters:
linux:
network:
@@ -164,38 +129,12 @@ index 38431a5..066488b 100644
enabled: true
type: eth
proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
-index 97eda6c..3f18ccd 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
-@@ -10,9 +10,9 @@ classes:
- - cluster.virtual-mcp-ocata-odl
- parameters:
- _param:
-- primary_interface: ens4
-- tenant_interface: ens5
-- external_interface: ens6
-+ primary_interface: enp2s0
-+ tenant_interface: enp3s0
-+ external_interface: enp4s0
- interface_mtu: 9000
- linux_system_codename: xenial
- loopback_device_size: 10
-@@ -52,7 +52,7 @@ parameters:
- interface:
- dhcp_int:
- enabled: true
-- name: ens3
-+ name: enp1s0
- proto: dhcp
- type: eth
- mtu: ${_param:interface_mtu}
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
-index 17c22c5..ca3a812 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
-@@ -40,13 +40,13 @@ parameters:
- version: latest
+diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
+index 328d6df..57c6cec 100644
+--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
+@@ -27,7 +27,7 @@ parameters:
+ linux:
network:
interface:
- ens4:
@@ -203,39 +142,19 @@ index 17c22c5..ca3a812 100644
enabled: true
type: eth
proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
-- ens6:
-+ enp4s0:
- enabled: true
- type: eth
- proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
-index e8421ca..657ddd3 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
-@@ -6,9 +6,9 @@ classes:
- - cluster.virtual-mcp-ocata-odl
- parameters:
- _param:
-- primary_interface: ens4
-- tenant_interface: ens5
-- external_interface: ens6
-+ primary_interface: enp2s0
-+ tenant_interface: enp3s0
-+ external_interface: enp4s0
- interface_mtu: 9000
- linux_system_codename: xenial
- neutron_agents:
-@@ -32,7 +32,7 @@ parameters:
+diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
+index 38431a5..066488b 100644
+--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
+@@ -10,7 +10,7 @@ parameters:
+ linux:
+ network:
interface:
- dhcp_int:
+- ens4:
++ enp2s0:
enabled: true
-- name: ens3
-+ name: enp1s0
- proto: dhcp
type: eth
- mtu: ${_param:interface_mtu}
+ proto: static
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
index 864c71d..aec6cde 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
@@ -266,78 +185,6 @@ index 864c71d..aec6cde 100644
dpdk0_pci: '"0000:00:05.0"'
openstack_gateway_node01:
params:
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
-index c23ca7f..6d2f724 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
-@@ -12,9 +12,9 @@ classes:
- - cluster.virtual-mcp-ocata-ovs-dpdk
- parameters:
- _param:
-- primary_interface: ens4
-- tenant_interface: ens5
-- external_interface: ens6
-+ primary_interface: enp2s0
-+ tenant_interface: enp3s0
-+ external_interface: enp4s0
- interface_mtu: 9000
- linux_system_codename: xenial
- loopback_device_size: 10
-@@ -51,7 +51,7 @@ parameters:
- interface:
- dhcp_int:
- enabled: true
-- name: ens3
-+ name: enp1s0
- proto: dhcp
- type: eth
- mtu: ${_param:interface_mtu}
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
-index b85f085..20eb8f5 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
-@@ -40,13 +40,13 @@ parameters:
- version: latest
- network:
- interface:
-- ens4:
-+ enp2s0:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
-- ens6:
-+ enp4s0:
- enabled: true
- type: eth
- proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
-index e102c10..f153a19 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
-@@ -6,9 +6,9 @@ classes:
- - cluster.virtual-mcp-ocata-ovs-dpdk
- parameters:
- _param:
-- primary_interface: ens4
-- tenant_interface: ens5
-- external_interface: ens6
-+ primary_interface: enp2s0
-+ tenant_interface: enp3s0
-+ external_interface: enp4s0
- interface_mtu: 9000
- linux_system_codename: xenial
- neutron:
-@@ -22,7 +22,7 @@ parameters:
- interface:
- dhcp_int:
- enabled: true
-- name: ens3
-+ name: enp1s0
- proto: dhcp
- type: eth
- mtu: ${_param:interface_mtu}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index 97730b1..8cb0992 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -351,75 +198,3 @@ index 97730b1..8cb0992 100644
enabled: true
type: eth
proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
-index a86a7c6..0469fa0 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
-@@ -10,9 +10,9 @@ classes:
- - cluster.virtual-mcp-ocata-ovs
- parameters:
- _param:
-- primary_interface: ens4
-- tenant_interface: ens5
-- external_interface: ens6
-+ primary_interface: enp2s0
-+ tenant_interface: enp3s0
-+ external_interface: enp4s0
- interface_mtu: 9000
- linux_system_codename: xenial
- loopback_device_size: 10
-@@ -47,7 +47,7 @@ parameters:
- interface:
- dhcp_int:
- enabled: true
-- name: ens3
-+ name: enp1s0
- proto: dhcp
- type: eth
- mtu: ${_param:interface_mtu}
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
-index ae103cd..350b618 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
-@@ -40,13 +40,13 @@ parameters:
- version: latest
- network:
- interface:
-- ens4:
-+ enp2s0:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
-- ens6:
-+ enp4s0:
- enabled: true
- type: eth
- proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
-index 9257d86..26b0e4c 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
-@@ -6,9 +6,9 @@ classes:
- - cluster.virtual-mcp-ocata-ovs
- parameters:
- _param:
-- primary_interface: ens4
-- tenant_interface: ens5
-- external_interface: ens6
-+ primary_interface: enp2s0
-+ tenant_interface: enp3s0
-+ external_interface: enp4s0
- interface_mtu: 9000
- linux_system_codename: xenial
- neutron:
-@@ -20,7 +20,7 @@ parameters:
- interface:
- dhcp_int:
- enabled: true
-- name: ens3
-+ name: enp1s0
- proto: dhcp
- type: eth
- mtu: ${_param:interface_mtu}
diff --git a/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch
index 8f518de..848fcdd 100644
--- a/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch
@@ -49,11 +49,11 @@ index 01f8ee0..2dd62f9 100755
salt -C '* and not cfg01* and not mas01*' state.apply salt
diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack
-index 5ded58c..270bf35 100755
+index eaab135..050b648 100755
--- a/mcp/config/states/openstack
+++ b/mcp/config/states/openstack
-@@ -26,3 +26,5 @@ salt -I 'neutron:gateway' state.sls neutron
- salt -I 'nova:compute' state.sls nova
+@@ -31,3 +31,5 @@ salt -I 'ceilometer:server' state.sls ceilometer
+ salt -I 'ceilometer:agent' state.sls ceilometer
salt -I 'horizon:server' state.sls horizon
+
diff --git a/patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch
index 64bd707..5cfc92d 100644
--- a/patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch
+++ b/patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch
@@ -27,14 +27,13 @@ range for the public network to not include that address.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
mcp/config/states/networks | 6 +++---
+ .../classes/cluster/virtual-mcp-ocata-common/openstack_init.yml | 2 +-
+ .../classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml | 6 +++---
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml | 6 +++---
- .../classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml | 2 +-
.../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml | 6 +++---
- .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml | 2 +-
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml | 6 +++---
- .../classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml | 2 +-
mcp/scripts/net_public.xml | 2 +-
- 8 files changed, 16 insertions(+), 16 deletions(-)
+ 7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/mcp/config/states/networks b/mcp/config/states/networks
index 505153a..bd6e923 100755
@@ -58,6 +57,43 @@ index 505153a..bd6e923 100755
+ openstack subnet create --gateway ${PUBLIC_NET%.*}.254 --no-dhcp \
+ --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/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
+index a14a711..055d98c 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:
+ 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
+diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
+index 2f8e94a..bc95642 100644
+--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
+@@ -51,16 +51,16 @@ parameters:
+ params:
+ single_address: 172.16.10.105
+ tenant_address: 10.1.0.105
+- external_address: 10.16.0.105
++ external_address: 10.0.9.105
+ openstack_compute_node02:
+ params:
+ single_address: 172.16.10.106
+ tenant_address: 10.1.0.106
+- external_address: 10.16.0.106
++ external_address: 10.0.9.106
+ openstack_gateway_node01:
+ params:
+ tenant_address: 10.1.0.110
+- external_address: 10.16.0.110
++ external_address: 10.0.9.110
+ opendaylight_control_node01:
+ classes:
+ - cluster.${_param:cluster_name}.opendaylight.control
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
index 57c6cec..f519e22 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
@@ -82,19 +118,6 @@ index 57c6cec..f519e22 100644
opendaylight_control_node01:
classes:
- cluster.${_param:cluster_name}.opendaylight.control
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
-index 66e5a97..98625ff 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
-@@ -6,7 +6,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_tenant_network_types: "flat,vxlan"
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
index aec6cde..b69258f 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
@@ -120,19 +143,6 @@ index aec6cde..b69258f 100644
tenant_address: 10.1.0.110
- external_address: 10.16.0.110
+ external_address: 10.0.9.110
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
-index dfc0b51..b106e86 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
-@@ -6,7 +6,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_tenant_network_types: "flat,vlan"
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index 8cb0992..c8f8477 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -154,19 +164,6 @@ index 8cb0992..c8f8477 100644
tenant_address: 10.1.0.110
- external_address: 10.16.0.110
+ external_address: 10.0.9.110
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
-index 7079fd1..fccde1f 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
-@@ -6,7 +6,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_tenant_network_types: "flat,vxlan"
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/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch b/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch
index 42d830e..fea6058 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
@@ -25,28 +25,28 @@ index b841e88..17fbbfc 100644
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 e67a06d..066a6e2 100644
+index 0baebb6..c5a999b 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
@@ -54,7 +54,7 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
-- salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
+- 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:
+ system:
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 8bf43be..acf2b43 100644
+index 62f887d..23f205f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
@@ -54,7 +54,7 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
-- salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
+- 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:
+ system:
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 27690df..0470416 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
@@ -41,7 +41,7 @@ index 2dd62f9..3731c31 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 066a6e2..eae7586 100644
+index c5a999b..79a8e92 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:
@@ -170,7 +170,7 @@ index e49a205..ad99447 100644
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 acf2b43..57fb461 100644
+index 23f205f..d09c643 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
@@ -16,19 +16,19 @@ parameters:
diff --git a/patches/opnfv-fuel/0018-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0018-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
index 0dea963..e87610e 100644
--- a/patches/opnfv-fuel/0018-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
+++ b/patches/opnfv-fuel/0018-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
@@ -23,11 +23,11 @@ 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 bbb66a8..de7b9ec 100644
+index 1b439a9..bf8eb12 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -20,6 +20,15 @@ get_base_image() {
- wget -P /tmp -nc "${base_image}"
+ wget -P /tmp -N "${base_image}"
}
+cleanup_uefi() {
diff --git a/patches/opnfv-fuel/0022-lib.sh-Reuse-tmp-mcp.rsa-if-present.patch b/patches/opnfv-fuel/0022-lib.sh-Reuse-tmp-mcp.rsa-if-present.patch
index 3943fb3..6318b89 100644
--- a/patches/opnfv-fuel/0022-lib.sh-Reuse-tmp-mcp.rsa-if-present.patch
+++ b/patches/opnfv-fuel/0022-lib.sh-Reuse-tmp-mcp.rsa-if-present.patch
@@ -8,7 +8,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
1 file changed, 5 insertions(+)
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
-index de7b9ec..33ec8b0 100644
+index bf8eb12..5389ced 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -9,6 +9,11 @@ generate_ssh_key() {