From 29c39fd5a8fc8a4bb058b5c18a6c1d6a29544f4f Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 7 Jan 2018 22:11:04 +0100 Subject: [PATCH] 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. JIRA: ARMBAND-350 Change-Id: Ifd63c401f44e7ae51f50c5739cf1a20b5d27d287 Signed-off-by: Alexandru Avadanii --- ...-salt-formulas-Add-enable-armband-formula.patch | 22 ++++++++++------------ ...lt-formulas-armband-Extend-libvirt_domain.patch | 6 +++--- ...-virtng.py-virt.sls-Extend-libvirt_domain.patch | 2 +- .../0012-Add-opnfv-user-to-the-deployment.patch | 15 +++++++-------- upstream/fuel | 2 +- 5 files changed, 22 insertions(+), 25 deletions(-) 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 e1508ace..4d2ed29b 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 @@ -26,16 +26,16 @@ Signed-off-by: Guillermo Herrero Signed-off-by: Charalampos Kominos Signed-off-by: Alexandru Avadanii --- - mcp/config/states/openstack_ha | 2 + + mcp/config/states/openstack_ha | 1 + mcp/config/states/openstack_noha | 2 + - mcp/config/states/virtual_control_plane | 2 + + mcp/config/states/virtual_control_plane | 1 + .../armband/files/nova-libvirt-aarch64-rollup.diff | 76 ++++++++++++++++++++++ mcp/salt-formulas/armband/init.sls | 7 ++ mcp/salt-formulas/armband/nova_config.sls | 35 ++++++++++ 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, 140 insertions(+) + 9 files changed, 138 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 @@ -44,15 +44,14 @@ 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..cb7a9c4 100755 +index 62a9654..9b88964 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha -@@ -52,6 +52,8 @@ salt -I 'neutron:server' state.sls neutron -b 1 +@@ -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 -+wait_for 10 "! salt -I 'nova:compute' state.sls armband | " \ -+ "tee /dev/stderr | grep -Eq '(Not connected|No response)'" ++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'" @@ -67,16 +66,15 @@ index 0a27876..aa369e8 100755 + +salt -I 'nova:compute' state.sls armband diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index c7768f7..5565fe5 100755 +index 0607b31..ab026ef 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -27,6 +27,8 @@ if [ "${ERASE_ENV}" -eq 1 ]; then +@@ -27,6 +27,7 @@ if [ "${ERASE_ENV}" -eq 1 ]; then fi # KVM libvirt first, VCP deployment -+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" ++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 52236358..92ea8af7 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,7 +41,7 @@ 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 eeb0818..2b6666d 100755 +index ef2f78b..771182c 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 @@ -50,8 +50,8 @@ index eeb0818..2b6666d 100755 salt -C 'cmp*' state.apply linux.network || 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/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch index bdbe52bd..b801728f 100644 --- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -208,7 +208,7 @@ index a604d0a..166b368 100644 net_profile: default_ext cluster: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml -index 6bcc72d..53a1ddd 100644 +index bbc80e2..8efebc7 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml @@ -17,6 +17,9 @@ parameters: 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 e224e125..a1593c95 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 Signed-off-by: Guillermo Herrero --- 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-arch-common/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 2b6666d..85e2237 100755 +index 771182c..82f783d 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 2b6666d..85e2237 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 5565fe5..349ac27 100755 +index ab026ef..4212b8e 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -51,6 +51,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-arch-common/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml diff --git a/upstream/fuel b/upstream/fuel index 84f58189..ea6ecbb6 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit 84f58189f269be6633e0c8897d5624d3dfaaa650 +Subproject commit ea6ecbb6fb546e27fcc73e699e08c6cad31d2bd0 -- 2.16.6