From d5c6bdf59429722d1a5c8810b2c76fc3b2b95436 Mon Sep 17 00:00:00 2001
From: Victor Ryzhenkin <vryzhenkin@mirantis.com>
Date: Sun, 6 Sep 2015 02:36:07 +0300
Subject: [PATCH] Use default devstack functions for create murano in devsstack
 environment

- Modify endpoints creation
- Modify murano account creation

Change-Id: Ie238c26f8b2493e74de21dded07cea2404328a5b
Closes-Bug: #1492652
---
 contrib/devstack/lib/murano | 38 +++++++------------------------------
 devstack/plugin.sh          | 38 +++++++------------------------------
 2 files changed, 14 insertions(+), 62 deletions(-)

diff --git a/contrib/devstack/lib/murano b/contrib/devstack/lib/murano
index 81d42f8f0..d1e60d1fd 100644
--- a/contrib/devstack/lib/murano
+++ b/contrib/devstack/lib/murano
@@ -74,39 +74,15 @@ function create_murano_accounts() {
         return
     fi
 
-    SERVICE_TENANT=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }")
-    ADMIN_ROLE=$(openstack role list | awk "/ admin / { print \$2 }")
-
-    MURANO_USER=$(openstack user create \
-        $MURANO_ADMIN_USER \
-        --password "$SERVICE_PASSWORD" \
-        --project $SERVICE_TENANT \
-        --email murano@example.com \
-        | grep " id " | get_field 2)
-
-    openstack role add \
-        $ADMIN_ROLE \
-        --project $SERVICE_TENANT \
-        --user $MURANO_USER
+    create_service_user "murano"
 
     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-        MURANO_SERVICE=$(openstack service create \
-            application_catalog \
-            --name=murano \
-            --description="Application Catalog" \
-            | grep " id " | get_field 2)
-        openstack endpoint create \
-            $MURANO_SERVICE \
-            public "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
-            --region RegionOne
-        openstack endpoint create \
-            $MURANO_SERVICE \
-            admin "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
-            --region RegionOne
-        openstack endpoint create \
-            $MURANO_SERVICE \
-            internal "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
-            --region RegionOne
+        get_or_create_service "murano" "application_catalog" "Application Catalog Service"
+        get_or_create_endpoint "application_catalog" \
+            "$REGION_NAME" \
+            "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
+            "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
+            "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT"
     fi
 }
 
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 1d6882803..29b2be348 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -70,39 +70,15 @@ function create_murano_accounts() {
         return
     fi
 
-    SERVICE_TENANT=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }")
-    ADMIN_ROLE=$(openstack role list | awk "/ admin / { print \$2 }")
-
-    MURANO_USER=$(openstack user create \
-        $MURANO_ADMIN_USER \
-        --password "$SERVICE_PASSWORD" \
-        --project $SERVICE_TENANT \
-        --email murano@example.com \
-        | grep " id " | get_field 2)
-
-    openstack role add \
-        $ADMIN_ROLE \
-        --project $SERVICE_TENANT \
-        --user $MURANO_USER
+    create_service_user "murano"
 
     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-        MURANO_SERVICE=$(openstack service create \
-            application_catalog \
-            --name=murano \
-            --description="Application Catalog" \
-            | grep " id " | get_field 2)
-        openstack endpoint create \
-            $MURANO_SERVICE \
-            public "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
-            --region RegionOne
-        openstack endpoint create \
-            $MURANO_SERVICE \
-            admin "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
-            --region RegionOne
-        openstack endpoint create \
-            $MURANO_SERVICE \
-            internal "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
-            --region RegionOne
+        get_or_create_service "murano" "application_catalog" "Application Catalog Service"
+        get_or_create_endpoint "application_catalog" \
+            "$REGION_NAME" \
+            "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
+            "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
+            "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT"
     fi
 }