From 6eab8c989c257213586347f284362cc43f99d3f4 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 31 Dec 2017 15:58:25 +0100 Subject: p/fuel: Retry armband state, fail on not connected 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. Change-Id: I7b4302a89d60c94ab3f58cd6b8523cf668314a05 Signed-off-by: Alexandru Avadanii --- ...-salt-formulas-Add-enable-armband-formula.patch | 25 +++++++++++----------- ...lt-formulas-armband-Extend-libvirt_domain.patch | 4 ++-- .../0012-Add-opnfv-user-to-the-deployment.patch | 6 +++--- 3 files changed, 18 insertions(+), 17 deletions(-) (limited to 'patches') diff --git a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch index f1e7eeb2..66d7e713 100644 --- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0002-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); @@ -29,16 +28,16 @@ Signed-off-by: Guillermo Herrero Signed-off-by: Charalampos Kominos Signed-off-by: Alexandru Avadanii --- - mcp/config/states/openstack_ha | 1 + + mcp/config/states/openstack_ha | 2 + mcp/config/states/openstack_noha | 2 + - mcp/config/states/virtual_control_plane | 1 + + mcp/config/states/virtual_control_plane | 2 + .../armband/files/nova-libvirt-aarch64-rollup.diff | 270 +++++++++++++++++++++ mcp/salt-formulas/armband/init.sls | 7 + mcp/salt-formulas/armband/nova_config.sls | 34 +++ mcp/salt-formulas/armband/nova_libvirt.sls | 7 + mcp/salt-formulas/armband/qemu_efi.sls | 2 + mcp/salt-formulas/armband/vgabios.sls | 7 + - 9 files changed, 331 insertions(+) + 9 files changed, 333 insertions(+) create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff create mode 100644 mcp/salt-formulas/armband/init.sls create mode 100644 mcp/salt-formulas/armband/nova_config.sls @@ -47,19 +46,20 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/vgabios.sls diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha -index 62a9654..bf17e20 100755 +index 62a9654..cb7a9c4 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 +@@ -52,6 +52,8 @@ 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 10 "! salt -I 'nova:compute' state.sls armband | " \ ++ "tee /dev/stderr | grep -Eq '(Not connected|No response)'" 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 0a27876..f183f0c 100755 +index 0a27876..aa369e8 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -48,3 +48,5 @@ salt -I 'ceilometer:server' state.sls ceilometer @@ -67,16 +67,17 @@ index 0a27876..f183f0c 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 cabe44a..967fed6 100755 +index cabe44a..0672bb5 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 +@@ -27,6 +27,8 @@ if [ "${ERASE_ENV}" -eq 1 ]; then fi # KVM libvirt first, VCP deployment -+salt -C 'kvm*' state.sls armband || true ++wait_for 10 "! salt -C 'kvm*' state.sls armband | " \ ++ "tee /dev/stderr | grep -Eq '(Not connected|No response)'" wait_for 5 "salt -C 'kvm*' state.sls libvirt" salt -C 'kvm* or cmp*' state.apply salt 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 db1d8956..9f91446e 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,14 +41,14 @@ Signed-off-by: Alexandru Avadanii 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 a8bb3b9..7c30515 100755 +index a8bb3b9..2554c5d 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -26,6 +26,7 @@ salt -C 'kvm*' pkg.install bridge-utils salt -C 'kvm*' state.apply linux.network 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'" 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 c0dbe12d..fcc43a40 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 @@ -22,7 +22,7 @@ Signed-off-by: Guillermo Herrero create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init -index 7c30515..ea4d23c 100755 +index 2554c5d..fecdb47 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,10 +34,10 @@ index 7c30515..ea4d23c 100755 salt -C 'cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 967fed6..3e58448 100755 +index 0672bb5..99bb83d 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 +@@ -51,6 +51,8 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do ((attempt+=1)) done -- cgit 1.2.3-korg