openstack
/
devstack-plugin-kafka
Code Issues Proposed changes

Add support for virtual_host parameter 

Depends-On: Idd164444c04e9f465a43ee909af840a41bb090c0
Change-Id: I4fe6c0139ea1d05c2978b2c223c38ae30d28d2a9
Partial-Bug: #1709081
This commit is contained in:
Kenneth Giusti 2017-08-07 09:41:36 -04:00 committed by Andrew Smith
parent 05a09eb2cc
commit 0c4ae8012e
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
devstack/plugin.sh
View File

@ -40,19 +40,21 @@ set +o xtrace
# builds rpc transport url string # builds rpc transport url string
function _get_rpc_transport_url { function _get_rpc_transport_url {
local virtual_host=$1
if [ -z "$RPC_USERNAME" ]; then if [ -z "$RPC_USERNAME" ]; then
echo "amqp://$RPC_HOST:${RPC_PORT}/" echo "amqp://$RPC_HOST:${RPC_PORT}/$virtual_host"
else else
echo "amqp://$RPC_USERNAME:$RPC_PASSWORD@$RPC_HOST:${RPC_PORT}/" echo "amqp://$RPC_USERNAME:$RPC_PASSWORD@$RPC_HOST:${RPC_PORT}/$virtual_host"
fi fi
} }
# builds notify transport url string # builds notify transport url string
function _get_notify_transport_url { function _get_notify_transport_url {
local virtual_host=$1
if [ -z "$NOTIFY_USERNAME" ]; then if [ -z "$NOTIFY_USERNAME" ]; then
echo "kafka://$NOTIFY_HOST:${NOTIFY_PORT}/" echo "kafka://$NOTIFY_HOST:${NOTIFY_PORT}/$virtual_host"
else else
echo "kafka://$NOTIFY_USERNAME:$NOTIFY_PASSWORD@$NOTIFY_HOST:${NOTIFY_PORT}/" echo "kafka://$NOTIFY_USERNAME:$NOTIFY_PASSWORD@$NOTIFY_HOST:${NOTIFY_PORT}/$virtual_host"
fi fi
} }
@ -366,8 +368,10 @@ if is_service_enabled kafka; then
local package=$1 local package=$1
local file=$2 local file=$2
local section=${3:-DEFAULT} local section=${3:-DEFAULT}
iniset $file $section transport_url $(_get_rpc_transport_url) local virtual_host=$4
iniset $file oslo_messaging_notifications transport_url $(_get_notify_transport_url)
iniset $file $section transport_url $(_get_rpc_transport_url "$virtual_host")
iniset $file oslo_messaging_notifications transport_url $(_get_notify_transport_url "$virtual_host")
} }
function get_transport_url { function get_transport_url {
# TODO (ansmith) introduce separate get_*_transport calls in devstak # TODO (ansmith) introduce separate get_*_transport calls in devstak
@ -376,9 +380,14 @@ if is_service_enabled kafka; then
function get_notification_url { function get_notification_url {
_get_notify_transport_url $@ _get_notify_transport_url $@
} }
function rpc_backend_add_vhost {
return 0
}
export -f iniset_rpc_backend export -f iniset_rpc_backend
export -f get_transport_url export -f get_transport_url
export -f get_notification_url export -f get_notification_url
export -f rpc_backend_add_vhost
fi fi
# check for kafka service # check for kafka service

4
devstack/settings
View File

@ -6,8 +6,8 @@ enable_service kafka
KAFKA_DEST=${KAFKA_DEST:-/opt/stack/devstack-plugin-kafka} KAFKA_DEST=${KAFKA_DEST:-/opt/stack/devstack-plugin-kafka}
# Specify Kafka version # Specify Kafka version
KAFKA_VERSION=${KAFKA_VERSION:-0.10.2.1} KAFKA_VERSION=${KAFKA_VERSION:-1.0.0}
KAFKA_BASEURL=${KAFKA_BASEURL:-http://www.us.apache.org/dist/kafka} KAFKA_BASEURL=${KAFKA_BASEURL:-http://www.apache.org/dist/kafka}
# Specify Scala version # Specify Scala version
SCALA_VERSION=${SCALA_VERSION:-2.12} SCALA_VERSION=${SCALA_VERSION:-2.12}