diff options
| author | Amrith Kumar <amrith@tesora.com> | 2016-06-14 11:39:45 -0400 |
|---|---|---|
| committer | Amrith Kumar <amrith@tesora.com> | 2016-06-21 10:44:25 -0400 |
| commit | 9aa8ff69605e1a332952ac34c6be1cc1d5b98858 (patch) | |
| tree | 6e224b1677d2ba71e53945cb954e44d7af3f2061 /devstack | |
| parent | a5f1ec074c0cfff6fd6065410915e665ef356b3b (diff) | |
| download | trove-9aa8ff69605e1a332952ac34c6be1cc1d5b98858.tar.gz | |
Move the rabbit/rpc options to its own section
Using the DEFAULT section for rabbit configuration is deprecated, so
all rabbit related option should be moved to the oslo_messaging_rabbit
section. The example agent config still respects the
TROVE_HOST_GATEWAY option.
This change has to depend on a change in redstack that otherwise
overwrites the hard work we do here :)
Change-Id: Ic169efdb2eb453abb6c4401a082586715a84a038
Depends-On: Iec072877e9174e136b4f0c1c806d7f9b377a7f2e
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/plugin.sh | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f27dbc6a..5add6a80 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -115,8 +115,12 @@ function configure_trove { iniset_conditional $TROVE_CONF DEFAULT max_instances_per_tenant $TROVE_MAX_INSTANCES_PER_TENANT iniset_conditional $TROVE_CONF DEFAULT max_volumes_per_tenant $TROVE_MAX_VOLUMES_PER_TENANT - iniset $TROVE_CONF DEFAULT rabbit_userid $RABBIT_USERID - iniset $TROVE_CONF DEFAULT rabbit_password $RABBIT_PASSWORD + iniset $TROVE_CONF DEFAULT rpc_backend "rabbit" + iniset $TROVE_CONF oslo_messaging_rabbit rabbit_hosts $RABBIT_HOST + iniset $TROVE_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD + iniset $TROVE_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID + + iniset $TROVE_CONF database connection `database_connection_url trove` iniset $TROVE_CONF DEFAULT default_datastore $TROVE_DATASTORE_TYPE setup_trove_logging $TROVE_CONF @@ -136,8 +140,11 @@ function configure_trove { iniset_conditional $TROVE_TASKMANAGER_CONF DEFAULT usage_timeout $TROVE_USAGE_TIMEOUT iniset_conditional $TROVE_TASKMANAGER_CONF DEFAULT state_change_wait_time $TROVE_STATE_CHANGE_WAIT_TIME - iniset $TROVE_TASKMANAGER_CONF DEFAULT rabbit_userid $RABBIT_USERID - iniset $TROVE_TASKMANAGER_CONF DEFAULT rabbit_password $RABBIT_PASSWORD + iniset $TROVE_TASKMANAGER_CONF DEFAULT rpc_backend "rabbit" + iniset $TROVE_TASKMANAGER_CONF oslo_messaging_rabbit rabbit_hosts $RABBIT_HOST + iniset $TROVE_TASKMANAGER_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD + iniset $TROVE_TASKMANAGER_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID + iniset $TROVE_TASKMANAGER_CONF database connection `database_connection_url trove` iniset $TROVE_TASKMANAGER_CONF DEFAULT taskmanager_manager trove.taskmanager.manager.Manager iniset $TROVE_TASKMANAGER_CONF DEFAULT nova_proxy_admin_user radmin @@ -149,8 +156,11 @@ function configure_trove { # (Re)create trove conductor conf file if needed if is_service_enabled tr-cond; then - iniset $TROVE_CONDUCTOR_CONF DEFAULT rabbit_userid $RABBIT_USERID - iniset $TROVE_CONDUCTOR_CONF DEFAULT rabbit_password $RABBIT_PASSWORD + iniset $TROVE_CONDUCTOR_CONF DEFAULT rpc_backend "rabbit" + iniset $TROVE_CONDUCTOR_CONF oslo_messaging_rabbit rabbit_hosts $RABBIT_HOST + iniset $TROVE_CONDUCTOR_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD + iniset $TROVE_CONDUCTOR_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID + iniset $TROVE_CONDUCTOR_CONF database connection `database_connection_url trove` iniset $TROVE_CONDUCTOR_CONF DEFAULT nova_proxy_admin_user radmin iniset $TROVE_CONDUCTOR_CONF DEFAULT nova_proxy_admin_tenant_name trove @@ -164,9 +174,12 @@ function configure_trove { iniset_conditional $TROVE_GUESTAGENT_CONF DEFAULT state_change_wait_time $TROVE_STATE_CHANGE_WAIT_TIME # Set up Guest Agent conf - iniset $TROVE_GUESTAGENT_CONF DEFAULT rabbit_userid $RABBIT_USERID - iniset $TROVE_GUESTAGENT_CONF DEFAULT rabbit_host $TROVE_HOST_GATEWAY - iniset $TROVE_GUESTAGENT_CONF DEFAULT rabbit_password $RABBIT_PASSWORD + iniset $TROVE_GUESTAGENT_CONF DEFAULT rpc_backend "rabbit" + + iniset $TROVE_GUESTAGENT_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD + iniset $TROVE_GUESTAGENT_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID + iniset $TROVE_GUESTAGENT_CONF oslo_messaging_rabbit rabbit_hosts $TROVE_HOST_GATEWAY + iniset $TROVE_GUESTAGENT_CONF DEFAULT nova_proxy_admin_user radmin iniset $TROVE_GUESTAGENT_CONF DEFAULT nova_proxy_admin_tenant_name trove iniset $TROVE_GUESTAGENT_CONF DEFAULT nova_proxy_admin_pass $RADMIN_USER_PASS |