From 03be4044f851bb8ee66a5d9b8ec1b53ed3b56672 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Wed, 28 Sep 2016 10:20:27 +0300 Subject: [PATCH] Removes remaining Hyper-V plugin The Hyper-V Neutron plugin was fully decomposed from neutron and moved into the networking-hyperv project. The only thing that remained was a debtcollector move for the HyperVSecurityGroupsDriver, in order to prevent deployments from breaking when upgrading to Mitaka or Newton from older versions. Co-Authored-By: Gary Kotton Change-Id: Iddc14fc4c52ba1a851e79bcd4cf4f09c63b52312 --- neutron/plugins/hyperv/__init__.py | 0 neutron/plugins/hyperv/agent/__init__.py | 0 .../hyperv/agent/security_groups_driver.py | 34 ------------------- ...ecurity-group-driver-fdbe0c0c292a1505.yaml | 13 +++++++ 4 files changed, 13 insertions(+), 34 deletions(-) delete mode 100644 neutron/plugins/hyperv/__init__.py delete mode 100644 neutron/plugins/hyperv/agent/__init__.py delete mode 100644 neutron/plugins/hyperv/agent/security_groups_driver.py create mode 100644 releasenotes/notes/hyperv-security-group-driver-fdbe0c0c292a1505.yaml diff --git a/neutron/plugins/hyperv/__init__.py b/neutron/plugins/hyperv/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/neutron/plugins/hyperv/agent/__init__.py b/neutron/plugins/hyperv/agent/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/neutron/plugins/hyperv/agent/security_groups_driver.py b/neutron/plugins/hyperv/agent/security_groups_driver.py deleted file mode 100644 index 51ac293a2ea..00000000000 --- a/neutron/plugins/hyperv/agent/security_groups_driver.py +++ /dev/null @@ -1,34 +0,0 @@ -#Copyright 2014 Cloudbase Solutions SRL -#All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from debtcollector import moves -from hyperv.neutron import security_groups_driver as sg_driver -from oslo_log import log as logging - -from neutron._i18n import _LW - -LOG = logging.getLogger(__name__) - -# TODO(claudiub): Remove this module at the beginning of the O cycle. - -new_driver = 'hyperv.neutron.security_groups_driver.HyperVSecurityGroupsDriver' -LOG.warning(_LW("You are using the deprecated firewall driver: " - "%(deprecated)s.Use the recommended driver %(new)s instead."), - {'deprecated': '%s.HyperVSecurityGroupsDriver' % __name__, - 'new': new_driver}) - -HyperVSecurityGroupsDriver = moves.moved_class( - sg_driver.HyperVSecurityGroupsDriver, - 'HyperVSecurityGroupsDriver', __name__) diff --git a/releasenotes/notes/hyperv-security-group-driver-fdbe0c0c292a1505.yaml b/releasenotes/notes/hyperv-security-group-driver-fdbe0c0c292a1505.yaml new file mode 100644 index 00000000000..8ff419cae14 --- /dev/null +++ b/releasenotes/notes/hyperv-security-group-driver-fdbe0c0c292a1505.yaml @@ -0,0 +1,13 @@ +--- +prelude: > + Hyper-V Neutron Agent has been fully decomposed from Neutron. Therefore, the + `neutron.plugins.hyperv.agent.security_groups_driver.HyperVSecurityGroupsDriver` + firewall driver has been deleted. + Update the `neutron_hyperv_agent.conf` / `neutron_ovs_agent.conf` files on the + Hyper-V nodes to use `hyperv.neutron.security_groups_driver.HyperVSecurityGroupsDriver`, + which is the networking_hyperv security groups driver. +upgrade: + - Update the `neutron_hyperv_agent.conf` / `neutron_ovs_agent.conf` files on the + Hyper-V nodes to use `hyperv.neutron.security_groups_driver.HyperVSecurityGroupsDriver`, + which is the networking_hyperv security groups driver. +