From 3a5b8775e2c7a535073e82da15bef18df5730762 Mon Sep 17 00:00:00 2001
From: Adrian Czarnecki <adrian.czarnecki@ts.fujitsu.com>
Date: Mon, 18 Jun 2018 12:59:54 +0200
Subject: [PATCH] Enable python3 in devstack

Change-Id: I44f09c9068ecd682d7c91945a5e32842ab335b80
---
 devstack/lib/client.sh       |  3 +++
 devstack/lib/notification.sh |  4 +++-
 devstack/lib/persister.sh    |  4 ++++
 devstack/lib/ui.sh           | 14 ++++++++++----
 devstack/plugin.sh           | 11 ++++++++++-
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/devstack/lib/client.sh b/devstack/lib/client.sh
index 43d639fb1..5ae21fd18 100644
--- a/devstack/lib/client.sh
+++ b/devstack/lib/client.sh
@@ -18,6 +18,9 @@ _XTRACE_MON_CLIENT=$(set +o | grep xtrace)
 set +o xtrace
 
 install_monascaclient() {
+    if python3_enabled; then
+        enable_python3_package python-monascaclient
+    fi
     git_clone $MONASCA_CLIENT_REPO $MONASCA_CLIENT_DIR $MONASCA_CLIENT_BRANCH
     setup_dev_lib "python-monascaclient"
 
diff --git a/devstack/lib/notification.sh b/devstack/lib/notification.sh
index 13afb8fc8..c060ca2af 100644
--- a/devstack/lib/notification.sh
+++ b/devstack/lib/notification.sh
@@ -43,7 +43,9 @@ install_monasca-notification() {
 
     git_clone ${MONASCA_NOTIFICATION_REPO} ${MONASCA_NOTIFICATION_DIR} \
         ${MONASCA_NOTIFICATION_BRANCH}
-
+    if python3_enabled; then
+        enable_python3_package monasca-notification
+    fi
     setup_develop ${MONASCA_NOTIFICATION_DIR}
     # see devstack/plugin.sh
     install_monasca_common
diff --git a/devstack/lib/persister.sh b/devstack/lib/persister.sh
index 8af939396..6b5db2c9e 100644
--- a/devstack/lib/persister.sh
+++ b/devstack/lib/persister.sh
@@ -125,6 +125,10 @@ clean_monasca-persister() {
 
 # python
 install_monasca_persister_python() {
+    echo_summary "Installing monasca-persister"
+    if python3_enabled; then
+        enable_python3_package monasca-persister
+    fi
     setup_develop ${MONASCA_PERSISTER_DIR}
 
     install_monasca_common
diff --git a/devstack/lib/ui.sh b/devstack/lib/ui.sh
index 8ff419647..7d22c0074 100644
--- a/devstack/lib/ui.sh
+++ b/devstack/lib/ui.sh
@@ -37,10 +37,13 @@ function configure_ui {
         sed -e "
             s#getattr(settings, 'GRAFANA_URL', None)#{'RegionOne': \"http:\/\/${SERVICE_HOST}:3000\", }#g;
         " -i "${MONASCA_BASE}"/monasca-ui/monitoring/config/local_settings.py
-
-        DJANGO_SETTINGS_MODULE=openstack_dashboard.settings python "${MONASCA_BASE}"/horizon/manage.py collectstatic --noinput
-        DJANGO_SETTINGS_MODULE=openstack_dashboard.settings python "${MONASCA_BASE}"/horizon/manage.py compress --force
-
+        if python3_enabled; then
+            DJANGO_SETTINGS_MODULE=openstack_dashboard.settings python3 "${MONASCA_BASE}"/horizon/manage.py collectstatic --noinput
+            DJANGO_SETTINGS_MODULE=openstack_dashboard.settings python3 "${MONASCA_BASE}"/horizon/manage.py compress --force
+        else
+            DJANGO_SETTINGS_MODULE=openstack_dashboard.settings python "${MONASCA_BASE}"/horizon/manage.py collectstatic --noinput
+            DJANGO_SETTINGS_MODULE=openstack_dashboard.settings python "${MONASCA_BASE}"/horizon/manage.py compress --force
+        fi
         restart_service apache2 || true
     fi
 }
@@ -49,6 +52,9 @@ function install_ui {
     if is_ui_enabled; then
         git_clone $MONASCA_UI_REPO $MONASCA_UI_DIR $MONASCA_UI_BRANCH
         git_clone $MONASCA_CLIENT_REPO $MONASCA_CLIENT_DIR $MONASCA_CLIENT_BRANCH
+        if python3_enabled; then
+            enable_python3_package monasca-ui
+        fi
 
         setup_develop $MONASCA_UI_DIR
         setup_dev_lib "python-monascaclient"
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 5e7a45022..ac4e29d44 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -768,6 +768,10 @@ function install_monasca-api {
     echo_summary "Install Monasca monasca_api "
 
     git_clone $MONASCA_API_REPO $MONASCA_API_DIR $MONASCA_API_BRANCH
+
+    if python3_enabled; then
+        enable_python3_package monasca-api
+    fi
     setup_develop $MONASCA_API_DIR
 
     install_monasca_common
@@ -1130,7 +1134,12 @@ function install_monasca_agent {
     sudo mkdir -p /opt/monasca-agent || true
     sudo chown $STACK_USER:monasca /opt/monasca-agent
 
-    (cd /opt/monasca-agent ; virtualenv .)
+    if python3_enabled; then
+        (cd /opt/monasca-agent ; virtualenv -p python3 .)
+        sudo rm -rf /opt/stack/monasca-common/.eggs/
+    else
+        (cd /opt/monasca-agent ; virtualenv .)
+    fi
 
     PIP_VIRTUAL_ENV=/opt/monasca-agent