diff options
| author | Ruby Loo <ruby.loo@intel.com> | 2017-02-01 17:33:58 +0000 |
|---|---|---|
| committer | Ruby Loo <ruby.loo@intel.com> | 2017-02-01 17:33:58 +0000 |
| commit | 2a086dbf1b672cf0d1064509e80d61432d25b3f1 (patch) | |
| tree | d1c984bb9afbc35d93ecaff3a3ee9aa806711600 /ironic/dhcp | |
| parent | 965619314d31ed7651626a14cb152f8dfb1ec089 (diff) | |
| download | ironic-2a086dbf1b672cf0d1064509e80d61432d25b3f1.tar.gz | |
Use delay configoption for ssh.SSHPower drivers
In Newton (6.0.0), the configuration option
'[neutron]/port_setup_delay' was introduced [1].
In order not to break ssh power drivers, if that
option was set to 0 (default value), we coded it
to be 15 seconds.
The deprecation period for that is over; this
removes that code. Users should explicitly set the
option to the desired value.
[1] https://review.openstack.org/#/c/293876/
Change-Id: Iffddb1087dcb424101bf693d4c2ae83e1639fd17
Fixes-Bug: #1661050
Diffstat (limited to 'ironic/dhcp')
| -rw-r--r-- | ironic/dhcp/neutron.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ironic/dhcp/neutron.py b/ironic/dhcp/neutron.py index f9b0b9e87..a335cea7b 100644 --- a/ironic/dhcp/neutron.py +++ b/ironic/dhcp/neutron.py @@ -26,7 +26,6 @@ from ironic.common import network from ironic.common import neutron from ironic.conf import CONF from ironic.dhcp import base -from ironic.drivers.modules import ssh from ironic import objects LOG = logging.getLogger(__name__) @@ -146,14 +145,6 @@ class NeutronDHCPApi(base.BaseDHCP): # sufficient DHCP config for netboot. It may occur when we are using # VMs or hardware server with fast boot enabled. port_delay = CONF.neutron.port_setup_delay - # TODO(vsaienko) remove hardcoded value for SSHPower driver - # after Newton release. - if isinstance(task.driver.power, ssh.SSHPower) and port_delay == 0: - LOG.warning(_LW("Setting the port delay to 15 for SSH power " - "driver by default, this will be removed in " - "Ocata release. Please set configuration " - "parameter port_setup_delay to 15.")) - port_delay = 15 if port_delay != 0: LOG.debug("Waiting %d seconds for Neutron.", port_delay) time.sleep(port_delay) |