aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-08 16:59:11 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-08 17:21:27 +0100
commit91d249e3087014902930e2475facd40077d3aedd (patch)
treeca1f4bf204e9b058b7dbb81a2ae8154903a0370f
parent22f9c97db5345d47768ae0552f9f175a5b3356ce (diff)
u/fuel: Bump & rebase for Ubuntu `modprobe -f` fix
Squash in additional changes: - p/fuel: Retry armband state, fail on not connected - u/fuel: Bump & rebase for wait_for changes While at it, catch armband state minion timeout (not connected or no response) and reduce armband state retry from 10 to 5. We no longer expect the armband state to fail on any nodes, baremetal or virtual, kvm or cmp, so remove failsafe `|| true` and retry state apply in case minions did not repond. JIRA: ARMBAND-350 Change-Id: I7b4302a89d60c94ab3f58cd6b8523cf668314a05 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commmit 6eab8c989c257213586347f284362cc43f99d3f4) (cherry picked from commmit 29c39fd5a8fc8a4bb058b5c18a6c1d6a29544f4f)
-rw-r--r--patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch15
-rw-r--r--patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch8
-rw-r--r--patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch15
m---------upstream/fuel0
4 files changed, 18 insertions, 20 deletions
diff --git a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
index 9d0c7b3..6e4618b 100644
--- a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
@@ -15,7 +15,6 @@ Subject: [PATCH] salt-formulas: Add & enable armband formula
- prereq: fix missing link for vgabios binary blob;
- nova patch: Support qemu >= 2.10 (backport from [1]);
- nova patch: Add video type virtio for AArch64 (backport from [2]);
-- nova patch: libvirt driver: Add ttyAMA0 by default on AArch64;
- nova patch: libvirt driver: AArch64: ACPI depends on AAVMF;
- nova conf: cpu_model=cortex-a57 (only for virtual deploys);
- nova conf: virt_type=qemu (only for virtual deploys);
@@ -46,19 +45,19 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
create mode 100644 mcp/salt-formulas/armband/vgabios.sls
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index fbddc6e..6bad8da 100755
+index fbddc6e..4f5e327 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -52,6 +52,7 @@ salt -I 'neutron:server' state.sls neutron -b 1
salt -I 'neutron:gateway' state.sls neutron.gateway
salt -I 'nova:compute' state.sls nova
-+salt -I 'nova:compute' state.sls armband || true
++wait_for 5.0 "salt -I 'nova:compute' state.sls armband"
salt -I 'mongodb:server' state.sls mongodb || true
wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
-index 369e165..d2a0b63 100755
+index 369e165..2eb6811 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -47,3 +47,5 @@ salt -I 'ceilometer:server' state.sls ceilometer
@@ -66,17 +65,17 @@ index 369e165..d2a0b63 100755
salt -I 'horizon:server' state.sls horizon
+
-+salt -I 'nova:compute' state.sls armband || true
++salt -I 'nova:compute' state.sls armband
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 039673c..9240f76 100755
+index 33cc9dc..d717f39 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -27,6 +27,7 @@ if [ "${ERASE_ENV}" -eq 1 ]; then
fi
# KVM libvirt first, VCP deployment
-+salt -C 'kvm*' state.sls armband || true
- wait_for 5 "salt -C 'kvm*' state.sls libvirt"
++wait_for 5.0 "salt -C 'kvm*' state.sls armband"
+ wait_for 5.0 "salt -C 'kvm*' state.sls libvirt"
salt -C 'kvm* or cmp*' state.apply salt
diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
diff --git a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index b644398..7772c2f 100644
--- a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
@@ -41,17 +41,17 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
create mode 100644 mcp/salt-formulas/armband/salt_minion.sls
diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index 5674e62..121dc8d 100755
+index 5a8cb49..c963e59 100755
--- a/mcp/config/states/baremetal_init
+++ b/mcp/config/states/baremetal_init
@@ -28,6 +28,7 @@ salt -C 'kvm* or cmp*' state.apply salt.minion
salt -C 'kvm* or cmp*' service.force_reload salt-minion
salt -C 'cmp*' state.apply linux.system
salt -C 'cmp*' state.apply linux.network || true
-+salt -C 'kvm*' state.apply armband.salt_minion || true
++salt -C 'kvm*' state.apply armband.salt_minion
salt -C 'kvm* or cmp*' system.reboot
- wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
- "tee /dev/stderr | grep -Fq 'Not connected'"
+ wait_for 90.0 "salt -C 'kvm* or cmp*' test.ping"
+
diff --git a/mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff b/mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff
new file mode 100644
index 0000000..9e74c24
diff --git a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch
index b3b1afc..203021a 100644
--- a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch
@@ -15,14 +15,14 @@ Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
---
mcp/config/states/baremetal_init | 1 +
- mcp/config/states/virtual_control_plane | 2 ++
+ mcp/config/states/virtual_control_plane | 1 +
mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml | 4 ++++
mcp/salt-formulas/opnfv/adduser.sls | 7 +++++++
- 4 files changed, 14 insertions(+)
+ 4 files changed, 13 insertions(+)
create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index 121dc8d..d343ae9 100755
+index c963e59..ab322db 100755
--- a/mcp/config/states/baremetal_init
+++ b/mcp/config/states/baremetal_init
@@ -23,6 +23,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
@@ -34,16 +34,15 @@ index 121dc8d..d343ae9 100755
salt -C 'kvm* or cmp*' state.apply salt.minion
salt -C 'kvm* or cmp*' service.force_reload salt-minion
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 9240f76..104281d 100755
+index d717f39..7ef4e15 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -50,6 +50,8 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
+@@ -49,6 +49,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
((attempt+=1))
done
-+wait_for 5 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply opnfv.adduser | " \
-+ "tee /dev/stderr | grep -Fq 'Not connected'"
- wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
++wait_for 5.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply opnfv.adduser"
+ wait_for 10.0 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
# Propagate APT proxy config created by curtin on baremetal nodes to VCP VMs
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml
diff --git a/upstream/fuel b/upstream/fuel
-Subproject f2a036df813ea9b428a64dc67a924955c9958f2
+Subproject 4874ba30071630c6b96eb6ea912a4fe047e0d93