aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config/states/openstack_ha
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-05-29 16:29:26 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-05-29 16:31:20 +0400
commit61c1ff928d01e4d18589877c455c57c802cdecc5 (patch)
treedf4ec25c80dfddaf34a457b51b6953df79727987 /mcp/config/states/openstack_ha
parent60bf21d6aedda367c3e017cd74ea8cf602f1fdef (diff)
Revert "Patch dhcp agent to avoid unwanted resync"
This reverts commit 7522bdb0e898144da2b6dc361dbdd549b39bc025. The original patch has been merged (https://review.opendev.org/661011) Change-Id: I9a1c04590145800523d546e36e9462fa7074922c Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/config/states/openstack_ha')
-rwxr-xr-xmcp/config/states/openstack_ha1
1 files changed, 0 insertions, 1 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 7c66704c8..7cf40086e 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -52,7 +52,6 @@ salt -I 'cinder:controller:role:primary' state.sls cinder
salt -I 'cinder:controller:role:secondary' state.sls cinder
wait_for 3.0 "salt -I 'cinder:volume' state.sls cinder"
-$(dirname "${BASH_SOURCE[0]}")/neutron_dhcp_agent_patch
salt -I 'neutron:server:role:primary' state.sls neutron
salt -I 'neutron:server:role:secondary' state.sls neutron
salt -I 'neutron:gateway' state.sls neutron.gateway