diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-03 17:55:08 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-03 18:29:17 +0200 |
| commit | 814acbf477a177b2f4df9464dcd876fb4b607ff8 (patch) | |
| tree | 1e2e3d7b3b7182b7fafa4d9c66a02a2abe7ce753 | |
| parent | db0fc039e923b03efbe645b59c75b4e01cecf8f6 (diff) | |
u/fuel: Bump & rebase for OVN HA scenario
Change-Id: I4538c6cd74874fdb2c0b00c40bfe85cc1921a8b1
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rw-r--r-- | .gitreview | 1 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch | 6 | ||||
| m--------- | upstream/fuel | 0 |
3 files changed, 3 insertions, 4 deletions
@@ -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 50687698..1714fdaa 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" diff --git a/upstream/fuel b/upstream/fuel -Subproject bb55bb795bd8f47598a38d445e0083fb6ca96b5 +Subproject c4156877d3f3f4f7efbca6e129bbeafdbe877d2 |