From 61c1ff928d01e4d18589877c455c57c802cdecc5 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Wed, 29 May 2019 16:29:26 +0400 Subject: 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 --- mcp/config/states/openstack_ha | 1 - 1 file changed, 1 deletion(-) (limited to 'mcp/config/states/openstack_ha') 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 -- cgit 1.2.3-korg