openstack/mistral
Code Issues Proposed changes

Small updates to devstack integration

Browse Source 
Fixes failing devstack tests when Mistral is installed (style error)
  and a bit of extra info in README file.

Change-Id: I24c7c982cb2ae5550a881961db587d6ccf2dccae
This commit is contained in:
bhavenst
2014-08-26 16:48:19 -04:00
parent 89d02b7627
commit 7678157665
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/devstack/README.rst
View File

@@ -6,15 +6,18 @@
$ cp lib/mistral ${DEVSTACK_DIR}/lib
$ cp extras.d/70-mistral.sh ${DEVSTACK_DIR}/extras.d
3. Create a ``localrc`` file as input to devstack.
3. Create a ``local.conf`` file as input to devstack.
4. The Mistral service is not enabled by default, so it must be
enabled in ``localrc`` before running ``stack.sh``. This example ``localrc``
enabled in ``local.conf`` before running ``stack.sh``. This example ``local.conf``
file shows all of the settings required for Mistral::
# Enable Mistral
enable_service mistral
# Use Keystone Identity API v3 (override 2.0 default)
IDENTITY_API_VERSION=3
5. Deploy your OpenStack Cloud with Mistral::
$ ./stack.sh

24
contrib/devstack/lib/mistral
View File

@@ -47,12 +47,12 @@ else
MISTRAL_BIN_DIR=$(get_python_exec_prefix)
fi
# create_mistral_accounts() - Set up common required mistral accounts
# create_mistral_accounts - Set up common required mistral accounts
#
# Tenant User Roles
# ------------------------------
# service mistral admin
function create_mistral_accounts() {
function create_mistral_accounts {
if ! is_service_enabled key; then
return
fi
@@ -98,7 +98,7 @@ function mkdir_chown_stack {
# Entry points
# ------------
# configure_mistral() - Set config files, create data dirs, etc
# configure_mistral - Set config files, create data dirs, etc
function configure_mistral {
mkdir_chown_stack "$MISTRAL_CONF_DIR"
@@ -132,15 +132,15 @@ function configure_mistral {
}
# init_mistral() - Initialize the database
function init_mistral() {
# init_mistral - Initialize the database
function init_mistral {
# (re)create Mistral database
recreate_database mistral utf8
}
# install_mistral() - Collect source and prepare
function install_mistral() {
# install_mistral - Collect source and prepare
function install_mistral {
install_mistral_pythonclient
git_clone $MISTRAL_REPO $MISTRAL_DIR $MISTRAL_BRANCH
@@ -152,20 +152,20 @@ function install_mistral() {
setup_package $MISTRAL_DIR -e
}
function install_mistral_pythonclient() {
function install_mistral_pythonclient {
git_clone $MISTRAL_PYTHONCLIENT_REPO $MISTRAL_PYTHONCLIENT_DIR $MISTRAL_PYTHONCLIENT_BRANCH
setup_package $MISTRAL_PYTHONCLIENT_DIR -e
}
# start_mistral() - Start running processes, including screen
function start_mistral() {
# start_mistral - Start running processes, including screen
function start_mistral {
screen_it mistral "cd $MISTRAL_DIR && $MISTRAL_BIN_DIR/mistral-server --config-file $MISTRAL_CONF_DIR/mistral.conf"
}
# stop_mistral() - Stop running processes
function stop_mistral() {
# stop_mistral - Stop running processes
function stop_mistral {
# Kill the Mistral screen windows
screen -S $SCREEN_NAME -p mistral -X kill
}