openstack/deb-mistral
Code Issues Proposed changes

Fix devstack back to rabbit

Browse Source 
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
This commit is contained in:
Nikolay Mahotkin 2014-09-26 11:53:00 +04:00
parent fd3b8a9938
commit 7499f55a26
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/devstack/lib/mistral
View File

@ -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.

4
etc/mistral.conf.sample
View File

@ -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

4
mistral/config.py
View File

@ -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.')