From 7499f55a2678af3fc3ad7c6391699bdc9ec15ed8 Mon Sep 17 00:00:00 2001 From: Nikolay Mahotkin Date: Fri, 26 Sep 2014 11:53:00 +0400 Subject: [PATCH] Fix devstack back to rabbit Found the root of the problem: Heat-engine uses queue 'engine' in rabbit, therefore we need to rename our queue in order to increase uniqueness Closes-Bug: #1324967 Change-Id: Iaf8a8f9f0357ae15ee4fc47d0031572a162526e6 --- contrib/devstack/lib/mistral | 2 +- etc/mistral.conf.sample | 4 ++-- mistral/config.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/devstack/lib/mistral b/contrib/devstack/lib/mistral index 0ff5105a3..fbd177bc9 100644 --- a/contrib/devstack/lib/mistral +++ b/contrib/devstack/lib/mistral @@ -110,7 +110,6 @@ function configure_mistral { # Run all Mistral processes as a single process iniset $MISTRAL_CONF_FILE DEFAULT server all - iniset $MISTRAL_CONF_FILE DEFAULT rpc_backend fake # Mistral Configuration #------------------------- @@ -124,6 +123,7 @@ function configure_mistral { iniset $MISTRAL_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD # Setup RabbitMQ credentials + iniset $MISTRAL_CONF_FILE DEFAULT rabbit_userid $RABBIT_USERID iniset $MISTRAL_CONF_FILE DEFAULT rabbit_password $RABBIT_PASSWORD # Configure the database. diff --git a/etc/mistral.conf.sample b/etc/mistral.conf.sample index eb498084e..ed6faf77d 100644 --- a/etc/mistral.conf.sample +++ b/etc/mistral.conf.sample @@ -462,7 +462,7 @@ #host=0.0.0.0 # The message topic that the engine listens on. (string value) -#topic=engine +#topic=mistral_engine # The version of the engine. (string value) #version=1.0 @@ -481,7 +481,7 @@ # The message topic that the executor listens on. (string # value) -#topic=executor +#topic=mistral_executor # The version of the executor. (string value) #version=1.0 diff --git a/mistral/config.py b/mistral/config.py index f414f37e8..e1a84b9fa 100644 --- a/mistral/config.py +++ b/mistral/config.py @@ -67,7 +67,7 @@ engine_opts = [ help='Name of the engine node. This can be an opaque ' 'identifier. It is not necessarily a hostname, ' 'FQDN, or IP address.'), - cfg.StrOpt('topic', default='engine', + cfg.StrOpt('topic', default='mistral_engine', help='The message topic that the engine listens on.'), cfg.StrOpt('version', default='1.0', help='The version of the engine.') @@ -78,7 +78,7 @@ executor_opts = [ help='Name of the executor node. This can be an opaque ' 'identifier. It is not necessarily a hostname, ' 'FQDN, or IP address.'), - cfg.StrOpt('topic', default='executor', + cfg.StrOpt('topic', default='mistral_executor', help='The message topic that the executor listens on.'), cfg.StrOpt('version', default='1.0', help='The version of the executor.')