summaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-05-29 16:29:26 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-05-31 07:13:35 +0000
commitfa2a3e158fa22058e2a8e9c71febcc3b11219d8f (patch)
tree0da29909c7a785034a9914e1d2bd51d0a6188101 /mcp/config
parent4e64c8495d8cddab653e7b6f8db1d4335755d4c9 (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> (cherry picked from commit 61c1ff928d01e4d18589877c455c57c802cdecc5)
Diffstat (limited to 'mcp/config')
-rwxr-xr-xmcp/config/states/neutron_dhcp_agent_patch12
-rwxr-xr-xmcp/config/states/neutron_gateway1
-rwxr-xr-xmcp/config/states/openstack_ha1
3 files changed, 0 insertions, 14 deletions
diff --git a/mcp/config/states/neutron_dhcp_agent_patch b/mcp/config/states/neutron_dhcp_agent_patch
deleted file mode 100755
index a9e14bee7..000000000
--- a/mcp/config/states/neutron_dhcp_agent_patch
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash -e
-##############################################################################
-# Copyright (c) 2019 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-# regression due to https://bugs.launchpad.net/neutron/+bug/1760047
-salt -I 'neutron:gateway' pkg.install python-neutron
-salt -I 'neutron:gateway' file.patch /usr/lib/python2.7/dist-packages/neutron/agent/dhcp/agent.py /var/tmp/dhcp_agent.patch || true
diff --git a/mcp/config/states/neutron_gateway b/mcp/config/states/neutron_gateway
index 06f9b7725..77b1167de 100755
--- a/mcp/config/states/neutron_gateway
+++ b/mcp/config/states/neutron_gateway
@@ -9,5 +9,4 @@
CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
-$(dirname "${BASH_SOURCE[0]}")/neutron_dhcp_agent_patch
salt -I 'neutron:gateway' state.sls neutron
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