openstack/devstack
Code Issues Proposed changes

Merge "Correct configuration setting using NUMBER_FAKE_NOVA_COMPUTE"

Browse Source
This commit is contained in:
Zuul 2018-02-22 20:47:56 +00:00 committed by Gerrit Code Review
commit a7a8675cc1
2 changed files with 7 additions and 2 deletions

7
functions

@ -446,7 +446,12 @@ function wait_for_compute {
ID="" ID=""
while [[ "\$ID" == "" ]]; do while [[ "\$ID" == "" ]]; do
sleep 1 sleep 1
ID=\$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" compute service list --host `hostname` --service nova-compute -c ID -f value) if [[ "$VIRT_DRIVER" = 'fake' ]]; then
# When using the fake driver the compute hostnames have a suffix of 1 to NUMBER_FAKE_NOVA_COMPUTE
ID=\$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" compute service list --host `hostname`1 --service nova-compute -c ID -f value)
else
ID=\$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" compute service list --host `hostname` --service nova-compute -c ID -f value)
fi
done done
EOF EOF
time_stop "wait_for_service" time_stop "wait_for_service"

2
lib/nova

@ -899,7 +899,7 @@ function start_nova_compute {
# creating or modifying real configurations. Each fake # creating or modifying real configurations. Each fake
# gets its own configuration and own log file. # gets its own configuration and own log file.
local fake_conf="${NOVA_FAKE_CONF}-${i}" local fake_conf="${NOVA_FAKE_CONF}-${i}"
iniset $fake_conf DEFAULT nhost "${HOSTNAME}${i}" iniset $fake_conf DEFAULT host "${HOSTNAME}${i}"
run_process "n-cpu-${i}" "$NOVA_BIN_DIR/nova-compute --config-file $NOVA_CPU_CONF --config-file $fake_conf" run_process "n-cpu-${i}" "$NOVA_BIN_DIR/nova-compute --config-file $NOVA_CPU_CONF --config-file $fake_conf"
done done
else else