Merge "Trivial fixes for devstack integration"

README.md

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

devstack/README.rst

@@ -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: ::
 
      [[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
 
 Run devstack as normal: ::

devstack/lib/senlin

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

devstack/plugin.sh

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