summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Herrero <guillermo.herrero@enea.com>2018-04-25 14:21:27 +0200
committerCristina Pauna <cristina.pauna@enea.com>2018-04-25 12:43:56 +0000
commitb3c8e34c2f14000fdd442e8fe7d2fddfa11f941c (patch)
tree7818f4fef5d3ce39b02a5a4e62c57cb91546b0cd
parente7796e2e5837c3dc25d04a70dfa1d75a7ca69c65 (diff)
u/fuel: Bump & rebase for openstack fix
Change-Id: I5d48b6cd8ad2b1d602ed86d5d1f69a0a806bc170 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> (cherry picked from commit 6657baa68d238e1cba9e1d69118616e438b07f37)
-rw-r--r--patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch4
m---------upstream/fuel0
2 files changed, 2 insertions, 2 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 f3b4c32a..3aae9688 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
@@ -45,7 +45,7 @@ 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 4f3760f6..115a56c1 100755
+index 07bd6b48..7b37bd97 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
@@ -55,7 +55,7 @@ index 4f3760f6..115a56c1 100755
+wait_for 5.0 "salt -I 'nova:compute' state.sls armband"
salt -C 'I@mongodb:server and *01*' state.sls mongodb || true
- wait_for 10 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
+ wait_for 10.0 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index 4c8cbcf8..1cf54240 100755
--- a/mcp/config/states/openstack_noha
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 58aa624bbe7d26ec23986b78f9ba59bafa7666a
+Subproject 9e9393ab60ff513f01b9ce045245e6c5808590a