u/fuel: Bump & rebase for multiarch reclass

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

diff --git a/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch b/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch
deleted file mode 100644 (file)
index 37df22c..0000000
--- a/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 11 Jul 2017 18:24:24 +0200
-Subject: [PATCH] mcp/config: AArch64: Use UEFI arm64 image
-
-While at it, bump default vCPU number from 2 to 6.
-
-Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- mcp/config/scenario/virtual/defaults.yaml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mcp/config/scenario/virtual/defaults.yaml b/mcp/config/scenario/virtual/defaults.yaml
-index b841e88..17fbbfc 100644
---- a/mcp/config/scenario/virtual/defaults.yaml
-+++ b/mcp/config/scenario/virtual/defaults.yaml
-@@ -1,6 +1,6 @@
--base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
-+base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
- virtual:
-   default:
--    vcpus: 2
-+    vcpus: 6
-     ram: 4096
-

diff --git a/patches/opnfv-fuel/0003-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
similarity index 98%
rename from patches/opnfv-fuel/0003-mcp-salt-formulas-Add-enable-armband-formula.patch
rename to patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
index 326cf11..4bf5648 100644 (file)
--- a/patches/opnfv-fuel/0003-mcp-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
@@ -45,10 +45,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 710ec0e..6c2ae04 100755
+index db0bd3f..9576333 100755
 --- a/mcp/config/states/maas
 +++ b/mcp/config/states/maas
-@@ -81,6 +81,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected
+@@ -86,6 +86,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
 
@@ -67,7 +67,7 @@ index eaab135..050b648 100755
 +
 +salt -I 'nova:compute' state.sls armband
 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index b9db817..cec5895 100755
+index 8ca76e4..c0b8ee3 100755
 --- a/mcp/config/states/openstack_ha
 +++ b/mcp/config/states/openstack_ha
 @@ -41,6 +41,7 @@ salt -I 'neutron:server' state.sls neutron -b 1

diff --git a/patches/opnfv-fuel/0002-classes-virtual-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0002-classes-virtual-AArch64-virtio-NIC-names-sync.patch
deleted file mode 100644 (file)
index e3cb48f..0000000
--- a/patches/opnfv-fuel/0002-classes-virtual-AArch64-virtio-NIC-names-sync.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 25 Jul 2017 02:53:16 +0200
-Subject: [PATCH] classes: virtual: AArch64: virtio NIC names sync
-
-grep -e "ens[[:digit:]]" -R . -l | \
-  xargs sed -i \
-    -e 's/ens3/enp1s0/g' \
-    -e 's/ens4/enp2s0/g' \
-    -e 's/ens5/enp3s0/g' \
-    -e 's/ens6/enp4s0/g'
-
-Since AArch64 will be using virtio-net-pci NIC model for guests,
-predictable interface naming yields a slightly different scheme.
-
-Update all configuration to reflect this.
-
-NOTE: Above configuration is expected with libvirt 3.x, which puts
-each NIC on a separate PCIe bus (which also imposes virtio modern
-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 +-
- .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml   | 6 +++---
- .../classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml        | 2 +-
- 7 files changed, 16 insertions(+), 16 deletions(-)
-
-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
--    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
-@@ -50,7 +50,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-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:
--        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-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
--    tenant_interface: ens5
--    external_interface: ens6
-+    primary_interface: enp2s0
-+    tenant_interface: enp3s0
-+    external_interface: enp4s0
-     interface_mtu: 9000
-     linux_system_codename: xenial
-   neutron:
-@@ -19,7 +19,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-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-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
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
-@@ -26,7 +26,7 @@ parameters:
-   linux:
-     network:
-       interface:
--        ens4:
-+        enp2s0:
-           enabled: true
-           type: eth
-           proto: static
-@@ -51,14 +51,14 @@ parameters:
-             single_address: 172.16.10.105
-             tenant_address: 10.1.0.105
-             external_address: 10.16.0.105
--            dpdk0_name: ens5
-+            dpdk0_name: enp3s0
-             dpdk0_pci: '"0000:00:05.0"'
-         openstack_compute_node02:
-           params:
-             single_address: 172.16.10.106
-             tenant_address: 10.1.0.106
-             external_address: 10.16.0.106
--            dpdk0_name: ens5
-+            dpdk0_name: enp3s0
-             dpdk0_pci: '"0000:00:05.0"'
-         openstack_gateway_node01:
-           params:
-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
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
-@@ -26,7 +26,7 @@ parameters:
-   linux:
-     network:
-       interface:
--        ens4:
-+        enp2s0:
-           enabled: true
-           type: eth
-           proto: static

diff --git a/patches/opnfv-fuel/0004-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch
similarity index 62%
rename from patches/opnfv-fuel/0004-network-public-Use-arm-virtual2-POD-config.patch
rename to patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch
index 0097a57..086fa62 100644 (file)
--- a/patches/opnfv-fuel/0004-network-public-Use-arm-virtual2-POD-config.patch
+++ b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch
@@ -35,12 +35,10 @@ 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/infra/config.yml       | 6 +++---
  .../classes/cluster/virtual-mcp-ocata-common/openstack_init.yml     | 2 +-
- .../classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml   | 6 +++---
- .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml     | 6 +++---
- mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml  | 6 +++---
  mcp/scripts/net_public.xml                                          | 2 +-
- 6 files changed, 14 insertions(+), 14 deletions(-)
+ 4 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/mcp/config/states/networks b/mcp/config/states/networks
 index 505153a..bd6e923 100755
@@ -64,73 +62,11 @@ 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-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
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
-@@ -50,17 +50,17 @@ 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
-             dpdk0_name: enp3s0
-             dpdk0_pci: '"0000:00:05.0"'
-         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
-             dpdk0_name: enp3s0
-             dpdk0_pci: '"0000:00:05.0"'
-         openstack_gateway_node01:
-           params:
-             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/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
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
-@@ -50,13 +50,13 @@ parameters:
+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 d60c81d..f31624e 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
+@@ -53,13 +53,13 @@ parameters:
            params:
              single_address: 172.16.10.105
              tenant_address: 10.1.0.105
@@ -147,6 +83,19 @@ 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-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/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/0005-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
similarity index 100%
rename from patches/opnfv-fuel/0005-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
rename to patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch

diff --git a/patches/opnfv-fuel/0007-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
similarity index 100%
rename from patches/opnfv-fuel/0007-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
rename to patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch

diff --git a/patches/opnfv-fuel/0008-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
similarity index 100%
rename from patches/opnfv-fuel/0008-maas-Add-curtin_userdata_arm64_generic_xenial.patch
rename to patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch

diff --git a/patches/opnfv-fuel/0006-mcp-config-AArch64-baremetal-Use-arm64-image.patch b/patches/opnfv-fuel/0006-mcp-config-AArch64-baremetal-Use-arm64-image.patch
deleted file mode 100644 (file)
index a47f299..0000000
--- a/patches/opnfv-fuel/0006-mcp-config-AArch64-baremetal-Use-arm64-image.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sun, 6 Aug 2017 19:34:06 +0200
-Subject: [PATCH] mcp/config: AArch64 baremetal: Use arm64 image
-
-While at it, bump default vCPU number from 2 to 6.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- mcp/config/scenario/baremetal/defaults.yaml                           | 4 ++--
- mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml | 2 +-
- mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/mcp/config/scenario/baremetal/defaults.yaml b/mcp/config/scenario/baremetal/defaults.yaml
-index b841e88..17fbbfc 100644
---- a/mcp/config/scenario/baremetal/defaults.yaml
-+++ b/mcp/config/scenario/baremetal/defaults.yaml
-@@ -1,6 +1,6 @@
--base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
-+base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
- virtual:
-   default:
--    vcpus: 2
-+    vcpus: 6
-     ram: 4096
-
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
-index 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: 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:
-     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 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: 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:
-     system:

diff --git a/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch
similarity index 92%
rename from patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch
rename to patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch
index 3ae543a..d9f64a1 100644 (file)
--- a/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch
+++ b/patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch
@@ -16,31 +16,30 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
  ci/deploy.sh                                       |  2 +-
  mcp/config/states/maas                             |  2 +-
- mcp/config/states/openstack_ha                     |  2 +-
  .../baremetal-mcp-ocata-odl-ha/infra/init.yml      | 22 ++++----
  .../baremetal-mcp-ocata-odl-ha/openstack/init.yml  | 62 +++++++++++-----------
  .../baremetal-mcp-ocata-ovs-ha/infra/init.yml      | 22 ++++----
  .../baremetal-mcp-ocata-ovs-ha/openstack/init.yml  | 60 ++++++++++-----------
- 7 files changed, 86 insertions(+), 86 deletions(-)
+ 6 files changed, 85 insertions(+), 85 deletions(-)
 
 diff --git a/ci/deploy.sh b/ci/deploy.sh
-index 4b64000..059ace5 100755
+index 36056c8..a2a0c02 100755
 --- a/ci/deploy.sh
 +++ b/ci/deploy.sh
-@@ -141,7 +141,7 @@ URI_REGEXP='(file|https?|ftp)://.*'
-
+@@ -142,7 +142,7 @@ URI_REGEXP='(file|https?|ftp)://.*'
  export SSH_KEY=${SSH_KEY:-"/var/lib/opnfv/mcp.rsa"}
  export SALT_MASTER=${SALT_MASTER_IP:-192.168.10.100}
+ export SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu}
 -export MAAS_IP=${MAAS_IP:-192.168.10.3}
 +export MAAS_IP=${MAAS_IP:-192.168.10.2}
  export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}"
+ export SSH_SALT="${SALT_MASTER_USER}@${SALT_MASTER}"
 
- # Variables below are disabled for now, to be re-introduced or removed later
 diff --git a/mcp/config/states/maas b/mcp/config/states/maas
-index 6c2ae04..787d713 100755
+index 9576333..603b530 100755
 --- a/mcp/config/states/maas
 +++ b/mcp/config/states/maas
-@@ -52,7 +52,7 @@ salt -C 'mas01*' state.apply linux.network.interface
+@@ -57,7 +57,7 @@ salt -C 'mas01*' state.apply linux.network.interface
  salt -C 'mas01*' state.apply maas.pxe_nat
  salt -C 'mas01*' state.apply maas.cluster
  salt -C 'cfg01*' cmd.run \
@@ -49,19 +48,8 @@ index 6c2ae04..787d713 100755
 
  wait_for 10 "salt -C 'mas01*' state.apply maas.region"
 
-diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index cec5895..9714c70 100755
---- a/mcp/config/states/openstack_ha
-+++ b/mcp/config/states/openstack_ha
-@@ -55,5 +55,5 @@ salt -I 'ceilometer:agent' state.sls ceilometer
- salt -I 'horizon:server' state.sls horizon
- salt -I 'nginx:server' state.sls nginx
-
--salt -C 'I@nginx:server and *01*' cp.push /etc/ssl/certs/10.167.4.80-with-chain.crt upload_path='certs/os_cacert'
-+salt -C 'I@nginx:server and *01*' cp.push /etc/ssl/certs/172.16.10.80-with-chain.crt upload_path='certs/os_cacert'
- cd /etc/ssl/certs && ln -s /var/cache/salt/master/minions/prx01.*/files/certs/os_cacert
 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 c5a999b..79a8e92 100644
+index f1769d7..393cbb3 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:
@@ -190,7 +178,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 23f205f..d09c643 100644
+index d7e365a..0b8bf2f 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/0010-classes-baremetal-arm-pod3-config-hardcode.patch b/patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch
similarity index 100%
rename from patches/opnfv-fuel/0010-classes-baremetal-arm-pod3-config-hardcode.patch
rename to patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch

diff --git a/patches/opnfv-fuel/0011-maas-boot-resources-Add-arm64-architecture.patch b/patches/opnfv-fuel/0008-maas-boot-resources-Add-arm64-architecture.patch
similarity index 100%
rename from patches/opnfv-fuel/0011-maas-boot-resources-Add-arm64-architecture.patch
rename to patches/opnfv-fuel/0008-maas-boot-resources-Add-arm64-architecture.patch

diff --git a/patches/opnfv-fuel/0012-libvirt-Use-libvirt-unix_sock_group.patch b/patches/opnfv-fuel/0009-libvirt-Use-libvirt-unix_sock_group.patch
similarity index 100%
rename from patches/opnfv-fuel/0012-libvirt-Use-libvirt-unix_sock_group.patch
rename to patches/opnfv-fuel/0009-libvirt-Use-libvirt-unix_sock_group.patch

diff --git a/patches/opnfv-fuel/0013-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
similarity index 97%
rename from patches/opnfv-fuel/0013-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
rename to patches/opnfv-fuel/0010-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 9671595..e421552 100644 (file)
--- a/patches/opnfv-fuel/0013-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 787d713..633f544 100755
+index 603b530..f6de2cb 100755
 --- a/mcp/config/states/maas
 +++ b/mcp/config/states/maas
-@@ -81,7 +81,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected
+@@ -86,7 +86,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/0014-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0011-virtng.py-virt.sls-Extend-libvirt_domain.patch
similarity index 100%
rename from patches/opnfv-fuel/0014-virtng.py-virt.sls-Extend-libvirt_domain.patch
rename to patches/opnfv-fuel/0011-virtng.py-virt.sls-Extend-libvirt_domain.patch

diff --git a/patches/opnfv-fuel/0015-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0012-mcp-salt-formulas-armband-AArch64-bootstrap.patch
similarity index 97%
rename from patches/opnfv-fuel/0015-mcp-salt-formulas-armband-AArch64-bootstrap.patch
rename to patches/opnfv-fuel/0012-mcp-salt-formulas-armband-AArch64-bootstrap.patch
index b0897e7..ada0766 100644 (file)
--- a/patches/opnfv-fuel/0015-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 633f544..c54225d 100755
+index f6de2cb..22d83be 100755
 --- a/mcp/config/states/maas
 +++ b/mcp/config/states/maas
-@@ -76,6 +76,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
+@@ -81,6 +81,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/0016-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0013-seedng-module-Add-AArch64-repo.patch
similarity index 100%
rename from patches/opnfv-fuel/0016-seedng-module-Add-AArch64-repo.patch
rename to patches/opnfv-fuel/0013-seedng-module-Add-AArch64-repo.patch

diff --git a/patches/opnfv-fuel/0017-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
similarity index 98%
rename from patches/opnfv-fuel/0017-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
rename to patches/opnfv-fuel/0014-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
index 8ce12c3..aa6aa5a 100644 (file)
--- a/patches/opnfv-fuel/0017-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 94a9bd3..f1781e8 100644
+index e123e52..2da13c0 100644
 --- a/mcp/scripts/lib.sh
 +++ b/mcp/scripts/lib.sh
 @@ -28,6 +28,15 @@ get_base_image() {

diff --git a/patches/opnfv-fuel/0018-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch
similarity index 100%
rename from patches/opnfv-fuel/0018-aarch64-skip-configuration-of-hugepages.patch
rename to patches/opnfv-fuel/0015-aarch64-skip-configuration-of-hugepages.patch

diff --git a/patches/opnfv-fuel/0019-baremetal-odl-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0016-baremetal-odl-Extend-arch-list-for-UCA-repo.patch
similarity index 100%
rename from patches/opnfv-fuel/0019-baremetal-odl-Extend-arch-list-for-UCA-repo.patch
rename to patches/opnfv-fuel/0016-baremetal-odl-Extend-arch-list-for-UCA-repo.patch

diff --git a/patches/opnfv-fuel/0020-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch
similarity index 95%
rename from patches/opnfv-fuel/0020-Add-opnfv-user-to-the-deployment.patch
rename to patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch
index f2b51d0..b286299 100644 (file)
--- a/patches/opnfv-fuel/0020-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch
@@ -24,10 +24,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 c54225d..6bd0aef 100755
+index 22d83be..03d336b 100755
 --- a/mcp/config/states/maas
 +++ b/mcp/config/states/maas
-@@ -75,6 +75,7 @@ salt -C 'mas01*' pillar.item\
+@@ -80,6 +80,7 @@ salt -C 'mas01*' pillar.item\
  salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
 
  salt -C 'kvm*' pkg.install bridge-utils
@@ -35,7 +35,7 @@ index c54225d..6bd0aef 100755
  salt -C 'kvm*' state.apply linux.network
  salt -C 'kvm*' state.apply armband.bootstrap_script_arm64
  salt -C 'kvm*' system.reboot
-@@ -98,6 +99,7 @@ while [ $rc -ne 0 ]; do
+@@ -103,6 +104,7 @@ while [ $rc -ne 0 ]; do
    rc=0
    for node in $vcp_nodes; do
      salt "$node" test.ping 2>/dev/null || { rc=$?; break; };
@@ -54,7 +54,7 @@ index 0000000..4cea805
 +    opnfv_user_username: opnfv
 +    opnfv_user_password: $1$5/pIEHT1$XFBhNWW4Q8gYd19hczgPF1
 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 79a8e92..fd615e4 100644
+index 393cbb3..eb0a8bc 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
 @@ -1,4 +1,5 @@
@@ -64,7 +64,7 @@ index 79a8e92..fd615e4 100644
  - cluster.baremetal-mcp-ocata-odl-ha.openstack
  # - cluster.baremetal-mcp-ocata-odl-ha.stacklight
 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 d09c643..f7789c6 100644
+index 0b8bf2f..fb2acda 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
 @@ -1,4 +1,5 @@

diff --git a/upstream/fuel b/upstream/fuel
index 9131283..a760c97 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit 91312836e649c24d2d0268f1f5c8aa45fdd79a8d
+Subproject commit a760c973e420371b07ac1739ba2d32a1df87226f