u/fuel: Bump & rebase for OVN HA scenario

Change-Id: I4538c6cd74874fdb2c0b00c40bfe85cc1921a8b1
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/.gitreview b/.gitreview
index cc44ef1..09e06ca 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,3 @@
 host=gerrit.opnfv.org
 port=29418
 project=armband.git
-defaultbranch=master

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 (file)
--- 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"

diff --git a/upstream/fuel b/upstream/fuel
index bb55bb7..c415687 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit bb55bb795bd8f47598a38d445e0083fb6ca96b50
+Subproject commit c4156877d3f3f4f7efbca6e129bbeafdbe877d22