openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Improve nova-ironic cellv2 discovery"

Browse Source
This commit is contained in:
Zuul 2018-04-21 03:05:46 +00:00 committed by Gerrit Code Review
commit b85aaa0a24
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/services/nova-api.yaml
View File

@ -185,7 +185,8 @@ outputs:
fi
done
echo "(cellv2) Running host discovery..."
su nova -s /bin/bash -c "/usr/bin/nova-manage cell_v2 discover_hosts --verbose"
su nova -s /bin/bash -c "/usr/bin/nova-manage cell_v2 discover_hosts --by-service --verbose"
nova_api_ensure_default_cell.sh:
mode: "0700"
content: |

1
docker/services/nova-ironic.yaml
View File

@ -60,6 +60,7 @@ outputs:
description: Role data for the Nova Compute service.
value:
service_name: {get_attr: [NovaIronicBase, role_data, service_name]}
cellv2_discovery: true
config_settings: {get_attr: [NovaIronicBase, role_data, config_settings]}
logging_source: {get_attr: [NovaIronicBase, role_data, logging_source]}
logging_groups: {get_attr: [NovaIronicBase, role_data, logging_groups]}

2
environments/services/ironic.yaml
View File

@ -4,5 +4,3 @@ resource_registry:
OS::TripleO::Services::IronicPxe: ../../docker/services/ironic-pxe.yaml
OS::TripleO::Services::NovaIronic: ../../docker/services/nova-ironic.yaml
OS::TripleO::Services::IronicNeutronAgent: ../../docker/services/ironic-neutron-agent.yaml
parameter_defaults:
NovaSchedulerDiscoverHostsInCellsInterval: 15