diff options
| -rwxr-xr-x | mcp/config/states/neutron_dhcp_agent_patch | 12 | ||||
| -rwxr-xr-x | mcp/config/states/neutron_gateway | 1 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_ha | 1 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml | 10 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml | 12 |
5 files changed, 0 insertions, 36 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 diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml index 2375ef54e..85e69b666 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml @@ -71,16 +71,6 @@ parameters: - nospec_store_bypass_disable - noibrs - noibpb - file: - /var/tmp/dhcp_agent.patch: - contents: | - 549,551c549,550 - < self.schedule_resync("Duplicate IP addresses found, " - < "DHCP cache is out of sync", - < created_port.network_id) - --- - > LOG.info("Duplicate IP addresses found for %s network", - > created_port.network_id) neutron: gateway: vlan_aware_vms: true diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml index fef8d4865..5100add1f 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml @@ -20,15 +20,3 @@ parameters: root_helper_daemon: false dhcp_lease_duration: 3600 report_interval: 120 - linux: - system: - file: - /var/tmp/dhcp_agent.patch: - contents: | - 549,551c549,550 - < self.schedule_resync("Duplicate IP addresses found, " - < "DHCP cache is out of sync", - < created_port.network_id) - --- - > LOG.info("Duplicate IP addresses found for %s network", - > created_port.network_id) |