openstack
/
fuel-devops
Code Issues Proposed changes

Merge "Add ironic pool when IRONIC_ENABLED"

This commit is contained in:
Jenkins 2017-03-09 12:02:44 +00:00 committed by Gerrit Code Review
parent 80a7d51598 1a477ca8e5
commit cf8d034d88
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devops/client/client.py
View File

@ -68,6 +68,15 @@ class DevopsClient(object):
"""
hw = settings.HARDWARE
networks_pools = dict(
admin=net_pool or settings.POOLS['admin'],
public=net_pool or settings.POOLS['public'],
management=net_pool or settings.POOLS['management'],
private=net_pool or settings.POOLS['private'],
storage=net_pool or settings.POOLS['storage'])
if settings.IRONIC_ENABLED:
networks_pools['ironic'] = net_pool or settings.POOLS['ironic']
config = templates.create_devops_config(
boot_from=boot_from,
env_name=env_name or settings.ENV_NAME,
@ -93,13 +102,7 @@ class DevopsClient(object):
networks_multiplenetworks=settings.MULTIPLE_NETWORKS,
networks_nodegroups=settings.NODEGROUPS,
networks_interfaceorder=settings.INTERFACE_ORDER,
networks_pools=dict(
admin=net_pool or settings.POOLS['admin'],
public=net_pool or settings.POOLS['public'],
management=net_pool or settings.POOLS['management'],
private=net_pool or settings.POOLS['private'],
storage=net_pool or settings.POOLS['storage'],
),
networks_pools=networks_pools,
networks_forwarding=settings.FORWARDING,
networks_dhcp=settings.DHCP,
driver_enable_acpi=settings.DRIVER_PARAMETERS['enable_acpi'],