60556a3f85
This patch introduces a new NovaServiceManager class. This class uses Nova's os-services API to make sure the service is actually up or down, instead of dumbly sleep()ing. Because the restart() method now calls stop and start in sequence, the [whitebox-nova-compute]/restart_command config option is no longer necessary, and has been removed. In its place, a new [whitebox-nova-compute]/start_command option is needed. Change-Id: I7b0c3635298b68981d9c460769a4d4ac9805357a
32 lines
1.3 KiB
Bash
32 lines
1.3 KiB
Bash
#!/bin/sh
|
|
|
|
function configure {
|
|
echo_summary "Configuring whitebox-tempest-plugin options"
|
|
iniset $TEMPEST_CONFIG whitebox ctlplane_ssh_username $STACK_USER
|
|
iniset $TEMPEST_CONFIG whitebox ctlplane_ssh_private_key_path $WHITEBOX_PRIVKEY_PATH
|
|
|
|
# This needs to come from Zuul, as devstack itself has no idea how many
|
|
# nodes are in the env
|
|
iniset $TEMPEST_CONFIG whitebox max_compute_nodes $MAX_COMPUTE_NODES
|
|
iniset $TEMPEST_CONFIG whitebox available_cinder_storage $WHITEBOX_AVAILABLE_CINDER_STORAGE
|
|
|
|
iniset $TEMPEST_CONFIG whitebox-nova-compute config_path "$WHITEBOX_NOVA_COMPUTE_CONFIG_PATH"
|
|
iniset $TEMPEST_CONFIG whitebox-nova-compute stop_command "$WHITEBOX_NOVA_COMPUTE_STOP_COMMAND"
|
|
iniset $TEMPEST_CONFIG whitebox-nova-compute start_command "$WHITEBOX_NOVA_COMPUTE_START_COMMAND"
|
|
|
|
iniset $TEMPEST_CONFIG whitebox-libvirt restart_command "$WHITEBOX_LIBVIRT_RESTART_COMMAND"
|
|
iniset $TEMPEST_CONFIG whitebox-libvirt stop_command "$WHITEBOX_LIBVIRT_STOP_COMMAND"
|
|
|
|
iniset $TEMPEST_CONFIG whitebox-database user $DATABASE_USER
|
|
iniset $TEMPEST_CONFIG whitebox-database password $DATABASE_PASSWORD
|
|
iniset $TEMPEST_CONFIG whitebox-database host $DATABASE_HOST
|
|
}
|
|
|
|
if [[ "$1" == "stack" ]]; then
|
|
if is_service_enabled tempest; then
|
|
if [[ "$2" == "test-config" ]]; then
|
|
configure
|
|
fi
|
|
fi
|
|
fi
|