openstack/trove
Code Issues Proposed changes

Merge "Update devstack to handle Trove/Neutron setups"

Browse Source
This commit is contained in:
Jenkins 2015-06-18 22:31:11 +00:00 committed by Gerrit Code Review
commit a41fe2c2d5
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
devstack/plugin.sh
View File

@ -191,6 +191,22 @@ function init_trove {
$TROVE_MANAGE datastore_update "Inactive_Datastore" ""
}
# finalize_trove_network() - do the last thing(s) before starting Trove
function finalize_trove_network {
management_network_id=$(neutron --os-tenant-name admin --os-username admin --os-password $ADMIN_PASSWORD net-list | grep $PRIVATE_NETWORK_NAME | awk '{print $2}')
echo "finalize_trove_network: found network id $management_network_id"
iniset $TROVE_CONF DEFAULT network_label_regex .*
iniset $TROVE_CONF DEFAULT ip_regex .*
iniset $TROVE_CONF DEFAULT blacklist_regex ^10.0.1.*
iniset $TROVE_CONF DEFAULT default_neutron_networks $management_network_id
iniset $TROVE_CONF DEFAULT network_driver trove.network.neutron.NeutronDriver
iniset $TROVE_TASKMANAGER_CONF DEFAULT network_driver trove.network.neutron.NeutronDriver
iniset $TROVE_TASKMANAGER_CONF mysql tcp_ports 22,3306
}
# start_trove() - Start running processes, including screen
function start_trove {
run_process tr-api "$TROVE_BIN_DIR/trove-api --config-file=$TROVE_CONF --debug"
@ -226,6 +242,16 @@ if is_service_enabled trove; then
# Initialize trove
init_trove
# finish the last step in trove network configuration
echo_summary "Finalizing Trove Network Configuration"
if is_service_enabled neutron; then
echo "finalize_trove_network: Neutron is enabled."
finalize_trove_network
else
echo "finalize_trove_network: Neutron is not enabled. Nothing to do."
fi
# Start the trove API and trove taskmgr components
echo_summary "Starting Trove"
start_trove