From 773b4745ade96e65f3b9e9707d6ea8b861dd5554 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 17 Oct 2017 16:06:14 +0200 Subject: u/fuel: Bump & rebase for state break & retry While at it, return true for all armband states that apply patches which are also providing a post-patching file hash. Change-Id: I303a2e142a8a9925f6630b53891ddc7bb0399453 Signed-off-by: Alexandru Avadanii (cherry picked from commit e68b725920bd313df0ca65a77b27c8de6a6e2937) --- ...cp-salt-formulas-Add-enable-armband-formula.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch') diff --git a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch index c09d21a7..7883349b 100644 --- a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch @@ -48,37 +48,37 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/vgabios.sls diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack -index 9683103..624b08e 100755 +index 19cd417..73983d2 100755 --- a/mcp/config/states/openstack +++ b/mcp/config/states/openstack -@@ -41,3 +41,5 @@ salt -I 'ceilometer:server' state.sls ceilometer +@@ -43,3 +43,5 @@ salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon + -+salt -I 'nova:compute' state.sls armband ++salt -I 'nova:compute' state.sls armband || true diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha -index 230288f..921b216 100755 +index aada4ad..afd6c53 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha -@@ -50,6 +50,7 @@ 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 -+salt -I 'nova:compute' state.sls armband ++salt -I 'nova:compute' state.sls armband || true salt -I 'mongodb:server' state.sls mongodb wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 58ae335..c645ffd 100755 +index 9094391..602eab2 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -18,6 +18,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected +@@ -22,6 +22,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp -+salt -C 'kvm*' state.sls armband - salt -C 'kvm*' state.sls libvirt ++salt -C 'kvm*' state.sls armband || true + wait_for 5 "salt -C 'kvm*' state.sls libvirt" salt -C '* and not cfg01* and not mas01*' state.apply salt diff --git a/mcp/salt-formulas/armband/files/nova-Update-vga-console-defaults-for-armv7-aarch64.diff b/mcp/salt-formulas/armband/files/nova-Update-vga-console-defaults-for-armv7-aarch64.diff -- cgit 1.2.3-korg