u/fuel: Bump & rebase for salt scripts new repo

While at it, drop patch that removes UCA repo in ODL scenario
and replace it with a patch that extends arch list for UCA repo
for arm64.

JIRA: ARMBAND-304

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

diff --git a/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch b/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch
index ba0498d..f430273 100644 (file)
--- a/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch
+++ b/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch
@@ -31,10 +31,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  2 files changed, 13 insertions(+), 2 deletions(-)
 
 diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
-index 36ee27b..1779954 100755
+index 9f88f1c..f12194b 100755
 --- a/mcp/scripts/salt.sh
 +++ b/mcp/scripts/salt.sh
-@@ -48,6 +48,12 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END
+@@ -47,6 +47,12 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END
    cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass
 
    cd /srv/salt/scripts

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 1b613a4..4b427da 100644 (file)
--- 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
@@ -45,7 +45,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 01f8ee0..2dd62f9 100755
+index 710ec0e..6c2ae04 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
@@ -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 cc4279c..32b581f 100755
+index fc1fed7..7ba9d82 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/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 da0840b..787dd8e 100644 (file)
--- 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
@@ -37,7 +37,7 @@ index f51ba5f..5582727 100755
 
  # 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 2dd62f9..3731c31 100755
+index 6c2ae04..787d713 100755
 --- a/mcp/config/states/maas
 +++ b/mcp/config/states/maas
 @@ -52,7 +52,7 @@ salt -C 'mas01*' state.apply linux.network.interface
@@ -50,16 +50,16 @@ index 2dd62f9..3731c31 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 32b581f..0d33c81 100755
+index 7ba9d82..af3e298 100755
 --- a/mcp/config/states/openstack_ha
 +++ b/mcp/config/states/openstack_ha
 @@ -46,5 +46,5 @@ salt -I 'nova:compute' state.sls armband
  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='/os_cacert'
-+salt -C 'I@nginx:server and *01*' cp.push /etc/ssl/certs/172.16.10.80-with-chain.crt upload_path='/os_cacert'
- cd /etc/ssl/certs && ln -s /var/cache/salt/master/minions/prx01.*/files/os_cacert
+-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
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml

diff --git a/patches/opnfv-fuel/0014-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0014-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index d66831f..9671595 100644 (file)
--- a/patches/opnfv-fuel/0014-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0014-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 3731c31..5e1dca1 100755
+index 787d713..633f544 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

diff --git a/patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch
index 623e3eb..b0897e7 100644 (file)
--- a/patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch
+++ b/patches/opnfv-fuel/0016-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 5e1dca1..9e0093b 100755
+index 633f544..c54225d 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

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 3286ebb..7f9c4a2 100644 (file)
--- 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
@@ -31,10 +31,10 @@ 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 1b439a9..bf8eb12 100644
+index 3f74058..5389ced 100644
 --- a/mcp/scripts/lib.sh
 +++ b/mcp/scripts/lib.sh
-@@ -20,6 +20,15 @@ get_base_image() {
+@@ -25,6 +25,15 @@ get_base_image() {
    wget -P /tmp -N "${base_image}"
  }
 
@@ -50,7 +50,7 @@ index 1b439a9..bf8eb12 100644
  cleanup_vms() {
    # clean up existing nodes
    for node in $(virsh list --name | grep -P '\w{3}\d{2}'); do
-@@ -34,6 +43,7 @@ prepare_vms() {
+@@ -39,6 +48,7 @@ prepare_vms() {
    local -n vnodes=$1
    local base_image=$2
 

diff --git a/patches/opnfv-fuel/0020-baremetal-odl-drop-UCA-repo.patch b/patches/opnfv-fuel/0020-baremetal-odl-Extend-arch-list-for-UCA-repo.patch
similarity index 66%
rename from patches/opnfv-fuel/0020-baremetal-odl-drop-UCA-repo.patch
rename to patches/opnfv-fuel/0020-baremetal-odl-Extend-arch-list-for-UCA-repo.patch
index 9331973..8f10da2 100644 (file)
--- a/patches/opnfv-fuel/0020-baremetal-odl-drop-UCA-repo.patch
+++ b/patches/opnfv-fuel/0020-baremetal-odl-Extend-arch-list-for-UCA-repo.patch
@@ -7,28 +7,26 @@
 : http://www.apache.org/licenses/LICENSE-2.0
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Fri, 25 Aug 2017 03:23:34 +0200
-Subject: [PATCH] baremetal: odl: drop UCA repo
+Date: Wed, 30 Aug 2017 22:15:07 +0200
+Subject: [PATCH] baremetal: odl: Extend arch list for UCA repo
+
+JIRA: https://jira.opnfv.org/browse/ARMBAND-304
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- .../classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml   | 6 ------
- 1 file changed, 6 deletions(-)
+ .../classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml       | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-index ea95680..60e0077 100644
+index ea95680..9b39962 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-@@ -198,12 +198,6 @@ parameters:
-     #billometer_identity_token: ${_param:keystone_service_token}
-   linux:
-     system:
--      repo:
--        uca:
--          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
+@@ -201,7 +201,7 @@ parameters:
+       repo:
+         uca:
+           source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
 -          architectures: amd64
--          key_id: EC4926EA
--          key_server: keyserver.ubuntu.com
++          architectures: amd64,arm64
+           key_id: EC4926EA
+           key_server: keyserver.ubuntu.com
        kernel:
-         sysctl:
-           net.ipv4.tcp_congestion_control: yeah

diff --git a/patches/opnfv-fuel/0021-states-maas-Retry-linux-state-if-no-response.patch b/patches/opnfv-fuel/0021-states-maas-Retry-linux-state-if-no-response.patch
deleted file mode 100644 (file)
index d7fcb42..0000000
--- a/patches/opnfv-fuel/0021-states-maas-Retry-linux-state-if-no-response.patch
+++ /dev/null
@@ -1,31 +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, 29 Aug 2017 01:21:30 +0200
-Subject: [PATCH] states: maas: Retry linux state if no response
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- mcp/config/states/maas | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/mcp/config/states/maas b/mcp/config/states/maas
-index 9e0093b..c54225d 100755
---- a/mcp/config/states/maas
-+++ b/mcp/config/states/maas
-@@ -104,7 +104,8 @@ done
-
- wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
- wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply salt"
--wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp"
-+wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp | " \
-+  "tee /dev/stderr | fgrep -q 'Not connected'"
-
- wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
-   $(awk 'NR==1{print $2}' $(eval echo ~${SUDO_USER}/.ssh/authorized_keys))"

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
deleted file mode 100644 (file)
index 75ea935..0000000
--- a/patches/opnfv-fuel/0022-lib.sh-Reuse-tmp-mcp.rsa-if-present.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, 29 Aug 2017 02:35:37 +0200
-Subject: [PATCH] lib.sh: Reuse /tmp/mcp.rsa if present
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- mcp/scripts/lib.sh | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
-index bf8eb12..5389ced 100644
---- a/mcp/scripts/lib.sh
-+++ b/mcp/scripts/lib.sh
-@@ -9,6 +9,11 @@ generate_ssh_key() {
-     user=${SUDO_USER}
-   fi
-
-+  if [ -f "/tmp/${SSH_KEY}" ]; then
-+    cp "/tmp/${SSH_KEY}" .
-+    ssh-keygen -f "${SSH_KEY}" -y > "${SSH_KEY}.pub"
-+  fi
-+
-   [ -f "${SSH_KEY}" ] || ssh-keygen -f "${SSH_KEY}" -N ''
-   install -o "${user}" -m 0600 "${SSH_KEY}" /tmp/
- }

diff --git a/upstream/fuel b/upstream/fuel
index d8c77e4..98f171c 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit d8c77e4e5453a27a66387d7deb23dba06d1e3ae7
+Subproject commit 98f171c82636c29a9cfd5c94c8e7aac7ca7af41b