From 8a38f84dd73009a8b7350b7771e170b2e67e6d9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dulko?= <mdulko@redhat.com>
Date: Wed, 12 Sep 2018 14:03:50 -0600
Subject: [PATCH] Add non-containerized Python 3.6 gate

Patch also changes the way we run kuryr-controller in the DevStack
plugin by removing the scripts/run_server.py and using the Python
executable in the system directly.

Implements: blueprint goal-python36

Change-Id: I1e1c62023b6018bf49163be12fdca5b42d5f46d6
---
 .zuul.d/octavia.yaml                            |  9 +++++++++
 .zuul.d/project.yaml                            |  1 +
 devstack/plugin.sh                              |  5 ++---
 .../remove-run-server-aca25a2d9d723dc7.yaml     |  5 +++++
 scripts/run_server.py                           | 17 -----------------
 5 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 releasenotes/notes/remove-run-server-aca25a2d9d723dc7.yaml
 delete mode 100644 scripts/run_server.py

diff --git a/.zuul.d/octavia.yaml b/.zuul.d/octavia.yaml
index 12eda5231..345ce65e6 100644
--- a/.zuul.d/octavia.yaml
+++ b/.zuul.d/octavia.yaml
@@ -61,6 +61,15 @@
       devstack_services:
         kuryr-daemon: true
 
+- job:
+    name: kuryr-kubernetes-tempest-daemon-octavia-py36
+    parent: kuryr-kubernetes-tempest-daemon-octavia
+    description: |
+      Tempest with Octavia, CNI daemon with DevStack running on Python 3.6
+    vars:
+      devstack_localrc:
+        USE_PYTHON3: true
+
 - job:
     name: kuryr-kubernetes-tempest-daemon-containerized-octavia
     parent: kuryr-kubernetes-tempest-daemon-octavia
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index 93f211d7c..4b245d3e1 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -48,6 +48,7 @@
         - kuryr-kubernetes-tempest-daemon-containerized-octavia-l2
         - kuryr-kubernetes-tempest-daemon-containerized-octavia-namespace
         - kuryr-kubernetes-tempest-daemon-containerized-octavia-network-policy
+        - kuryr-kubernetes-tempest-daemon-octavia-py36
         - kuryr-kubernetes-tempest-daemon-containerized-octavia-py36
         - kuryr-kubernetes-tempest-daemon-containerized-openshift-octavia-serial
         - kuryr-kubernetes-tempest-daemon-ovn
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index a0d64ad26..f98cb4dff 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -724,9 +724,8 @@ function run_kuryr_kubernetes {
             "${KURYR_HYPERKUBE_DATA_DIR}/kuryr-ca.crt" 1200
     fi
 
-    run_process kuryr-kubernetes \
-        "$python_bin ${KURYR_HOME}/scripts/run_server.py  \
-            --config-file $KURYR_CONFIG"
+    local controller_bin=$(which kuryr-k8s-controller)
+    run_process kuryr-kubernetes "$controller_bin --config-file $KURYR_CONFIG"
 }
 
 
diff --git a/releasenotes/notes/remove-run-server-aca25a2d9d723dc7.yaml b/releasenotes/notes/remove-run-server-aca25a2d9d723dc7.yaml
new file mode 100644
index 000000000..63c2836f7
--- /dev/null
+++ b/releasenotes/notes/remove-run-server-aca25a2d9d723dc7.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The scripts/run_server.py scripts gets removed as we no longer use it in
+    DevStack plugin.
diff --git a/scripts/run_server.py b/scripts/run_server.py
deleted file mode 100644
index 88388d531..000000000
--- a/scripts/run_server.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-from kuryr_kubernetes.cmd.eventlet import controller
-
-controller.start()