aboutsummaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-03 17:55:08 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-03 18:29:17 +0200
commit814acbf477a177b2f4df9464dcd876fb4b607ff8 (patch)
tree1e2e3d7b3b7182b7fafa4d9c66a02a2abe7ce753 /patches
parentdb0fc039e923b03efbe645b59c75b4e01cecf8f6 (diff)
u/fuel: Bump & rebase for OVN HA scenario
Change-Id: I4538c6cd74874fdb2c0b00c40bfe85cc1921a8b1 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches')
-rw-r--r--patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch6
1 files changed, 3 insertions, 3 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 5068769..1714fda 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
@@ -42,11 +42,11 @@ 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 f0809042..91c7e2f7 100755
+index a32111f6..6fff4368 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
+@@ -55,6 +55,7 @@ if salt 'cmp*' match.pillar 'neutron:compute' --out yaml --static | grep -q -e
+ fi
salt -I 'nova:compute' state.sls nova
+wait_for 5.0 "salt -I 'nova:compute' state.sls armband"