openstack/senlin
Code Issues Proposed changes

Trivial fixes for devstack integration

Browse Source 
Fix some typo in devstack integration
Fix endpoint url

Change-Id: I99711575d381054579da924acc7a5534f41f7019
This commit is contained in:
Ethan Lynn 2015-04-20 14:41:38 +08:00
parent 01ee398f27
commit 07c06e7a67
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -13,6 +13,11 @@ Developers will decide when to contribute it to OpenStack community.
IRC Channel: #senlin IRC Channel: #senlin
Install via Devstack
-----
Please refer to devstack/README.rst
Installation Installation
----- -----
* Get senlin code from github * Get senlin code from github

2
devstack/README.rst
View File

@ -9,7 +9,7 @@ Refer the quickstart guide for more information on using devstack and senlin.
To install senlin into devstack, add the following settings to enable senlin plugin: :: To install senlin into devstack, add the following settings to enable senlin plugin: ::
[[local|localrc]] [[local|localrc]]
enable_plugin senlin https://github.com/openstack/senlin master enable_plugin senlin https://github.com/stackforge/senlin master
enable_service sl-api sl-eng enable_service sl-api sl-eng
Run devstack as normal: :: Run devstack as normal: ::

6
devstack/lib/senlin
View File

@ -166,9 +166,9 @@ function create_senlin_accounts {
"clustering" "Senlin Clustering Service") "clustering" "Senlin Clustering Service")
get_or_create_endpoint $senlin_service \ get_or_create_endpoint $senlin_service \
"$REGION_NAME" \ "$REGION_NAME" \
"$SERVICE_PROTOCOL://$SENLIN_API_HOST:$SENLIN_API_PORT/v1" \ "$SERVICE_PROTOCOL://$SENLIN_API_HOST:$SENLIN_API_PORT/v1/\$(tenant_id)s" \
"$SERVICE_PROTOCOL://$SENLIN_API_HOST:$SENLIN_API_PORT/v1" \ "$SERVICE_PROTOCOL://$SENLIN_API_HOST:$SENLIN_API_PORT/v1/\$(tenant_id)s" \
"$SERVICE_PROTOCOL://$SENLIN_API_HOST:$SENLIN_API_PORT/v1" "$SERVICE_PROTOCOL://$SENLIN_API_HOST:$SENLIN_API_PORT/v1/\$(tenant_id)s"
fi fi
# senlin_stack_user role is for users created by Senlin # senlin_stack_user role is for users created by Senlin

8
devstack/plugin.sh
View File

@ -9,15 +9,9 @@ source $DEST/senlin/devstack/lib/senlin
(set -o posix; set) (set -o posix; set)
if is_service_enabled sl-api sl-eng; then if is_service_enabled sl-api sl-eng; then
if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then if [[ "$1" == "stack" && "$2" == "install" ]]; then
echo_summary "Before Installing senlin"
mkdir -p $SCREEN_LOGDIR
elif [[ "$1" == "stack" && "$2" == "install" ]]; then
echo_summary "Installing senlin" echo_summary "Installing senlin"
install_senlin install_senlin
# LIBS_FROM_GIT="${LIBS_FROM_GIT},python-senlinclient"
install_senlinclient install_senlinclient
cleanup_senlin cleanup_senlin
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then