From 2d451967be1aa9f8154d14325a6a673b2833b281 Mon Sep 17 00:00:00 2001
From: Elena Ezhova <eezhova@mirantis.com>
Date: Thu, 19 Jun 2014 12:49:32 +0400
Subject: [PATCH] Use oslo-messaging-zmq-receiver to start zeromq receiver

The project-specific receiver command nova-rpc-zmq-receiver
has been replaced with oslo-messaging-zmq-receiver.

We need to update devstack code accordingly.

Change-Id: I7696c649fa818ecb523b698ea4a23f70da60147d
Closes-Bug: 1279739
---
 lib/oslo | 3 +++
 stack.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/oslo b/lib/oslo
index dc6b550b6c..1b47e66edf 100644
--- a/lib/oslo
+++ b/lib/oslo
@@ -30,6 +30,9 @@ PYCADF_DIR=$DEST/pycadf
 STEVEDORE_DIR=$DEST/stevedore
 TASKFLOW_DIR=$DEST/taskflow
 
+# Support entry points installation of console scripts
+OSLO_BIN_DIR=$(get_python_exec_prefix)
+
 # Entry Points
 # ------------
 
diff --git a/stack.sh b/stack.sh
index bd99b5b752..f1ffb8a058 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1167,7 +1167,7 @@ fi
 
 if is_service_enabled zeromq; then
     echo_summary "Starting zermomq receiver"
-    screen_it zeromq "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-rpc-zmq-receiver"
+    screen_it zeromq "cd $NOVA_DIR && $OSLO_BIN_DIR/oslo-messaging-zmq-receiver"
 fi
 
 # Launch the nova-api and wait for it to answer before continuing