openstack/devstack
Code Issues Proposed changes

Configure nova_cell1.conf to use placement for reschedules

Browse Source 
Nova now calculates alternate hosts in the scheduler and
sends those to the cell for reschedules in case a build on
a given compute node fails.

The cell conductor needs to claim resources against the
alternate hosts in Placement during a reschedule, therefore
it needs to be configured to talk to the placement service.

Part of blueprint return-alternate-hosts

Change-Id: Ie599968d9e7537e551fe6d9deb63a91b256b1e11
This commit is contained in:
Matt Riedemann 2017-12-22 11:39:29 -05:00
parent c170097388
commit f6d566c21d
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/nova
View File

@ -600,6 +600,12 @@ function create_nova_conf {
else else
rpc_backend_add_vhost $vhost rpc_backend_add_vhost $vhost
iniset_rpc_backend nova $conf DEFAULT $vhost iniset_rpc_backend nova $conf DEFAULT $vhost
# When running in superconductor mode, the cell conductor
# must be configured to talk to the placement service for
# reschedules to work.
if is_service_enabled placement placement-client; then
configure_placement_nova_compute $conf
fi
fi fi
# Format logging # Format logging
setup_logging $conf setup_logging $conf

18
lib/placement
View File

@ -103,14 +103,16 @@ function _config_placement_apache_wsgi {
} }
function configure_placement_nova_compute { function configure_placement_nova_compute {
iniset $NOVA_CONF placement auth_type "password" # Use the provided config file path or default to $NOVA_CONF.
iniset $NOVA_CONF placement auth_url "$KEYSTONE_SERVICE_URI" local conf=${1:-$NOVA_CONF}
iniset $NOVA_CONF placement username placement iniset $conf placement auth_type "password"
iniset $NOVA_CONF placement password "$SERVICE_PASSWORD" iniset $conf placement auth_url "$KEYSTONE_SERVICE_URI"
iniset $NOVA_CONF placement user_domain_name "$SERVICE_DOMAIN_NAME" iniset $conf placement username placement
iniset $NOVA_CONF placement project_name "$SERVICE_TENANT_NAME" iniset $conf placement password "$SERVICE_PASSWORD"
iniset $NOVA_CONF placement project_domain_name "$SERVICE_DOMAIN_NAME" iniset $conf placement user_domain_name "$SERVICE_DOMAIN_NAME"
iniset $NOVA_CONF placement os_region_name "$REGION_NAME" iniset $conf placement project_name "$SERVICE_TENANT_NAME"
iniset $conf placement project_domain_name "$SERVICE_DOMAIN_NAME"
iniset $conf placement os_region_name "$REGION_NAME"
# TODO(cdent): auth_strategy, which is common to see in these # TODO(cdent): auth_strategy, which is common to see in these
# blocks is not currently used here. For the time being the # blocks is not currently used here. For the time being the
# placement api uses the auth_strategy configuration setting # placement api uses the auth_strategy configuration setting