summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-18 22:17:00 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-19 02:26:16 +0000
commitb23e59e31cddaa44361d429c2325a0f648c583c2 (patch)
treec8010b6d518714bff0cb864b8a8d3b8cfa546d89 /patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
parent8d69d6d274cfda09b86ac43eb75d002d7f9ba00e (diff)
u/fuel: Bump & rebase for netconfig rm via salt
Change-Id: I0de153ef4e5a71f350d29a90ae4c79b863d676eb Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 939bdcd9a425674eaca2d9556da4f34f11b0e23f)
Diffstat (limited to 'patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch')
-rw-r--r--patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch4
1 files changed, 2 insertions, 2 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 cc8599ab..3c413887 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
@@ -68,10 +68,10 @@ index e1fdf73..e1f705c 100755
salt -I 'mongodb:server' state.sls mongodb || true
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 43d1520..88e7080 100755
+index b9db08a..c798209 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -34,6 +34,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
+@@ -32,6 +32,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp