diff options
| author | Vasyl Saienko <vsaienko@mirantis.com> | 2016-11-17 11:03:00 +0200 |
|---|---|---|
| committer | Ruby Loo <ruby.loo@intel.com> | 2016-11-21 23:00:39 +0000 |
| commit | a9a1293312ca67c5e5dbb258146832516a41e939 (patch) | |
| tree | 0789f1156653ebfe5459b039ec6148aeb68faefc /ironic/dhcp | |
| parent | 6ef7e23aa35502f94fa5b0fc38244b0cd9d4bc25 (diff) | |
| download | ironic-a9a1293312ca67c5e5dbb258146832516a41e939.tar.gz | |
Remove deprecated Neutron DHCP provider methods
This patch removes deprecated methods from Neutron DHCP provider:
* create_cleaning_ports
* delete_cleaning_ports
Also drop related methods from deploy_utils in ironic.drivers.modules
* prepare_cleaning_ports
* tear_down_cleaning_ports
If you have your own custom ironic DHCP provider that implements
cleaning methods, you may need to update your code to use the
add_cleaning_network() and remove_cleaning_network() network interface
methods.
They were deprecated in I0c26582b6b6e9d32650ff3e2b9a3269c3c2d5454
Change-Id: I758e5b21028a4dfcca9c907c63020d0cfca4e37d
Closes-Bug: #1642512
Diffstat (limited to 'ironic/dhcp')
| -rw-r--r-- | ironic/dhcp/neutron.py | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/ironic/dhcp/neutron.py b/ironic/dhcp/neutron.py index af44e0bb4..eccb8ec1b 100644 --- a/ironic/dhcp/neutron.py +++ b/ironic/dhcp/neutron.py @@ -31,9 +31,6 @@ from ironic import objects LOG = logging.getLogger(__name__) -create_cleaning_ports_deprecation = False -delete_cleaning_ports_deprecation = False - class NeutronDHCPApi(base.BaseDHCP): """API for communicating to neutron 2.x API.""" @@ -298,38 +295,3 @@ class NeutronDHCPApi(base.BaseDHCP): task, task.portgroups, client) return port_ip_addresses + portgroup_ip_addresses - - # TODO(vsaienko) Remove this method when deprecation period is passed - # in Ocata. - def create_cleaning_ports(self, task): - """Create neutron ports for each port on task.node to boot the ramdisk. - - :param task: a TaskManager instance. - :raises: NetworkError, InvalidParameterValue - :returns: a dictionary in the form {port.uuid: neutron_port['id']} - """ - global create_cleaning_ports_deprecation - if not create_cleaning_ports_deprecation: - LOG.warning(_LW('create_cleaning_ports via dhcp provider is ' - 'deprecated. The node.network_interface setting ' - 'should be used instead.')) - create_cleaning_ports_deprecation = True - - return task.driver.network.add_cleaning_network(task) - - # TODO(vsaienko) Remove this method when deprecation period is passed - # in Ocata. - def delete_cleaning_ports(self, task): - """Deletes the neutron port created for booting the ramdisk. - - :param task: a TaskManager instance. - :raises: NetworkError, InvalidParameterValue - """ - global delete_cleaning_ports_deprecation - if not delete_cleaning_ports_deprecation: - LOG.warning(_LW('delete_cleaning_ports via dhcp provider is ' - 'deprecated. The node.network_interface setting ' - 'should be used instead.')) - delete_cleaning_ports_deprecation = True - - task.driver.network.remove_cleaning_network(task) |