u/fuel: Bump & rebase for neutron trunk ports

[armband.git] / patches / opnfv-fuel / 0001-mcp-salt-formulas-Add-enable-armband-formula.patch

diff --git a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
index c8d9305..8be2e80 100644 (file)
--- a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
@@ -58,7 +58,7 @@ index 19cd417..73983d2 100755
 +
 +salt -I 'nova:compute' state.sls armband || true
 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index 89733cc..f1479ef 100755
+index 9eaa3a1..2439ad6 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
@@ -70,10 +70,10 @@ index 89733cc..f1479ef 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 0650869..7611c12 100755
+index 43d1520..88e7080 100755
 --- a/mcp/config/states/virtual_control_plane
 +++ b/mcp/config/states/virtual_control_plane
-@@ -23,6 +23,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
+@@ -34,6 +34,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
 
  salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp