summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDinesh Bhor <dinesh.bhor@nttdata.com>2017-10-30 12:58:14 +0530
committerSampath Priyankara (samP) <sam47priya@gmail.com>2017-11-14 04:31:47 +0000
commit57bbe7deada89ad35da885451315f216d2f53919 (patch)
treee691d673766208cbfd36bb433b0318595539bcd8
parentbdafc3ef32bc28de67d378cb2b6ce4421e925977 (diff)
Fix devstack installation of masakari
Recently a commit: 188173a8072b143a28779b875af617ac7f35a92d got merged into masakari which replaces a rpc method 'get_transport' with 'get_rpc_transport'. The 'get_rpc_transport' expects the oslo.messaging config option 'transport_url' [1] to be present in the [DEFAULT] section of masakari.conf. The current masakari devstack script doesn't add 'transport_url' in masakari.conf which results into failure of devstack installation of masakari. This patch fixes this issue by using an inbuilt devstack function 'iniset_rpc_backend' to add the 'transport_url' config option in masakari.conf. [1] * https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/transport.py#L44 * https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/transport.py#L201 Closes-Bug: #1728544 Change-Id: I75da054c6669aa90dd96c3ede3ae98de74275de2
Notes
Notes (review): Code-Review+2: Rikimaru Honjo <honjo.rikimaru@po.ntt-tx.co.jp> Code-Review+1: Li Yingjun <yingjun.li@kylin-cloud.com> Code-Review+2: Tushar Patil <tushar.vitthal.patil@gmail.com> Workflow+1: Rikimaru Honjo <honjo.rikimaru@po.ntt-tx.co.jp> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 14 Nov 2017 05:31:16 +0000 Reviewed-on: https://review.openstack.org/516506 Project: openstack/masakari Branch: refs/heads/master
-rw-r--r--devstack/plugin.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index fda1d46..212e18d 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -122,6 +122,8 @@ function configure_masakari {
122 iniset $MASAKARI_CONF DEFAULT os_privileged_user_tenant "$SERVICE_PROJECT_NAME" 122 iniset $MASAKARI_CONF DEFAULT os_privileged_user_tenant "$SERVICE_PROJECT_NAME"
123 iniset $MASAKARI_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT" 123 iniset $MASAKARI_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT"
124 124
125 iniset_rpc_backend masakari $MASAKARI_CONF DEFAULT
126
125 if is_service_enabled tls-proxy; then 127 if is_service_enabled tls-proxy; then
126 iniset $MASAKARI_CONF DEFAULT masakari_api_listen_port $MASAKARI_SERVICE_PORT_INT 128 iniset $MASAKARI_CONF DEFAULT masakari_api_listen_port $MASAKARI_SERVICE_PORT_INT
127 fi 129 fi