From 91fb85429ee840637f5868493912174f164b7497 Mon Sep 17 00:00:00 2001
From: hamzah alqtaishat <hamalq@oath.com>
Date: Thu, 10 May 2018 16:30:09 -0700
Subject: Add devstack VENV build support

Change-Id: I7bccb19b9d629ccddac1dc2808f8a8b89ed5c7a7
---
 devstack/designate_plugins/backend-powerdns |  2 +-
 devstack/plugin.sh                          | 10 ++++++----
 devstack/settings                           | 11 +++++++++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/devstack/designate_plugins/backend-powerdns b/devstack/designate_plugins/backend-powerdns
index f8db9f23..295ceccd 100644
--- a/devstack/designate_plugins/backend-powerdns
+++ b/devstack/designate_plugins/backend-powerdns
@@ -148,7 +148,7 @@ function init_designate_backend {
 # create_designate_pool_configuration_backend - Perform post-pool config tasks
 function create_designate_pool_configuration_backend {
     # Init and migrate designate_pdns database
-    designate-manage powerdns sync $DESIGNATE_POOL_ID
+    $DESIGNATE_BIN_DIR/designate-manage powerdns sync $DESIGNATE_POOL_ID
 }
 
 # start_designate_backend - start any external services
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 2264a937..e128f589 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -194,6 +194,8 @@ function create_designate_accounts {
         get_or_create_service "designate" "dns" "Designate DNS Service"
         get_or_create_endpoint "dns" \
             "$REGION_NAME" \
+            "$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/" \
+            "$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/" \
             "$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/"
     fi
 }
@@ -201,7 +203,7 @@ function create_designate_accounts {
 # create_designate_pool_configuration - Create Pool Configuration
 function create_designate_pool_configuration {
     # Sync Pools Config
-    designate-manage pool update --file $DESIGNATE_CONF_DIR/pools.yaml
+    $DESIGNATE_BIN_DIR/designate-manage pool update --file $DESIGNATE_CONF_DIR/pools.yaml
 
     # Allow Backends to do backend specific tasks
     if function_exists create_designate_pool_configuration_backend; then
@@ -224,14 +226,14 @@ function init_designate {
     recreate_database designate utf8
 
     # Init and migrate designate database
-    designate-manage database sync
+    $DESIGNATE_BIN_DIR/designate-manage database sync
 
     if [ "$DESIGNATE_POOL_MANAGER_CACHE_DRIVER" == "sqlalchemy" ]; then
         # (Re)create designate_pool_manager cache
         recreate_database designate_pool_manager utf8
 
         # Init and migrate designate pool-manager-cache
-        designate-manage pool-manager-cache sync
+        $DESIGNATE_BIN_DIR/designate-manage pool-manager-cache sync
     fi
 
     init_designate_backend
@@ -338,7 +340,7 @@ if is_service_enabled designate; then
         install_designateclient
 
         echo_summary "Installing Designate"
-        install_designate
+        stack_install_service designate
 
         if is_service_enabled horizon; then
             echo_summary "Installing Designate dashboard"
diff --git a/devstack/settings b/devstack/settings
index d64faf77..94af2bce 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -39,9 +39,16 @@ DESIGNATE_SERVICE_PORT_DNS=${DESIGNATE_SERVICE_PORT_DNS:-53}
 DESIGNATE_SERVICE_PORT_MDNS=${DESIGNATE_SERVICE_PORT_MDNS:-5354}
 DESIGNATE_SERVICE_PORT_AGENT=${DESIGNATE_SERVICE_PORT_AGENT:-5358}
 
-# Default directories
-DESIGNATE_BIN_DIR=$(get_python_exec_prefix)
 DESIGNATE_DIR=$DEST/designate
+# Default directories
+# Support potential entry-points console scripts in VENV or not
+if [[ ${USE_VENV} = True ]]; then
+    PROJECT_VENV["designate"]=${DESIGNATE_DIR}.venv
+    DESIGNATE_BIN_DIR=${PROJECT_VENV["designate"]}/bin
+else
+    DESIGNATE_BIN_DIR=$(get_python_exec_prefix)
+fi
+
 DESIGNATEDASHBOARD_DIR=$DEST/designate-dashboard
 DESIGNATE_CONF_DIR=/etc/designate
 DESIGNATE_STATE_PATH=${DESIGNATE_STATE_PATH:=$DATA_DIR/designate}
-- 
cgit v1.2.1