openstack
/
fuel-agent
Code Issues Proposed changes

Merge "[Multitenancy] Add logic to work with network providers"

This commit is contained in:
Jenkins 2017-04-25 11:49:51 +00:00 committed by Gerrit Code Review
parent 2929226671 0d058150ad
commit 2df314ec83
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py
View File

@ -432,6 +432,7 @@ class FuelAgentDeploy(base.DeployInterface):
:returns: status of the deploy. One of ironic.common.states.
"""
manager_utils.node_power_action(task, states.POWER_OFF)
task.driver.network.unconfigure_tenant_networks(task)
return states.DELETED
def prepare(self, task):
@ -440,6 +441,12 @@ class FuelAgentDeploy(base.DeployInterface):
:param task: a TaskManager instance.
"""
node = task.node
if node.provision_state == states.DEPLOYING:
# Adding the node to provisioning network so that the dhcp
# options get added for the provisioning port.
manager_utils.node_power_action(task, states.POWER_OFF)
task.driver.network.add_provisioning_network(task)
_prepare_pxe_boot(task)
node.instance_info = build_instance_info_for_deploy(task)
@ -538,7 +545,11 @@ class FuelAgentVendor(base.VendorInterface):
LOG.info(_LI('Fuel Agent pass on node %s'), node.uuid)
manager_utils.node_set_boot_device(task, boot_devices.DISK,
persistent=True)
manager_utils.node_power_action(task, states.REBOOT)
manager_utils.node_power_action(task, states.POWER_OFF)
task.driver.network.remove_provisioning_network(task)
task.driver.network.configure_tenant_networks(task)
manager_utils.node_power_action(task, states.POWER_ON)
except Exception as e:
msg = (_('Deploy failed for node %(node)s. Error: %(error)s') %
{'node': node.uuid, 'error': e})