@@ -158,9 +158,6 @@ function install_rpc_backend {

         fi

         _configure_qpid

     elif is_service_enabled zeromq; then

-        # NOTE(ewindisch): Redis is not strictly necessary

-        # but there is a matchmaker driver that works

-        # really well & out of the box for multi-node.

         if is_fedora; then

             install_package zeromq python-zmq

             if [ "$ZEROMQ_MATCHMAKER" == "redis" ]; then

@@ -243,11 +240,15 @@ function iniset_rpc_backend {

     local section=$3

     if is_service_enabled zeromq; then

         iniset $file $section rpc_backend "zmq"

-        iniset $file $section rpc_zmq_matchmaker \

-            oslo_messaging._drivers.matchmaker_redis.MatchMakerRedis

-        # Set MATCHMAKER_REDIS_HOST if running multi-node.

-        MATCHMAKER_REDIS_HOST=${MATCHMAKER_REDIS_HOST:-127.0.0.1}

-        iniset $file matchmaker_redis host $MATCHMAKER_REDIS_HOST

+        iniset $file $section rpc_zmq_host `hostname`

+        if [ "$ZEROMQ_MATCHMAKER" == "redis" ]; then

+            iniset $file $section rpc_zmq_matchmaker \

+                oslo.messaging._drivers.matchmaker_redis.MatchMakerRedis

+            MATCHMAKER_REDIS_HOST=${MATCHMAKER_REDIS_HOST:-127.0.0.1}

+            iniset $file matchmaker_redis host $MATCHMAKER_REDIS_HOST

+        else

+            die $LINENO "Other matchmaker drivers not supported"

+        fi

     elif is_service_enabled qpid || [ -n "$QPID_HOST" ]; then

         # For Qpid use the 'amqp' oslo.messaging transport when AMQP 1.0 is used

         if [ "$RPC_MESSAGING_PROTOCOL" == "AMQP1" ]; then