From 50c581766ab9893616801b7b990c90f4c52f75a1 Mon Sep 17 00:00:00 2001
From: Hongbin Lu <hongbin034@gmail.com>
Date: Wed, 26 Dec 2018 16:34:15 +0000
Subject: [PATCH] Make multinode job voting

The multinode job is useful for catching issues on multinode
environment and this commit promote this job to voting.

In order to make the job success, this commit also fixes
two issues:
* Fix the nodeset of compute node (it should be 'subnode' instead
  of 'peers').
* Don't perform API-related configuration in compute node.

Change-Id: I16833dca7f442e5700a84dca042f04fb0edf25c7
---
 .zuul.yaml       |  4 ++--
 devstack/lib/zun | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index d9cfbdd1d..af182260c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -47,7 +47,7 @@
         KURYR_CAPABILITY_SCOPE: global
         USE_PYTHON3: true
     group-vars:
-      peers:
+      subnode:
         devstack_localrc:
           KURYR_CAPABILITY_SCOPE: global
           KURYR_PROCESS_EXTERNAL_CONNECTIVITY: false
@@ -73,7 +73,6 @@
 - job:
     name: zun-tempest-multinode-docker-sql
     parent: zun-tempest-base-multinode
-    voting: false
 
 - job:
     name: zun-tempest-docker-etcd
@@ -104,3 +103,4 @@
       jobs:
         - zun-tempest-docker-sql
         - zun-tempest-py35-docker-sql
+        - zun-tempest-multinode-docker-sql
diff --git a/devstack/lib/zun b/devstack/lib/zun
index 53cd1170f..ffcbc8724 100644
--- a/devstack/lib/zun
+++ b/devstack/lib/zun
@@ -120,13 +120,15 @@ function configure_zun {
     # Rebuild the config file from scratch
     create_zun_conf
 
-    create_api_paste_conf
+    if is_service_enabled zun-api; then
+        create_api_paste_conf
 
-    write_uwsgi_config "$ZUN_UWSGI_CONF" "$ZUN_UWSGI" "/container"
+        write_uwsgi_config "$ZUN_UWSGI_CONF" "$ZUN_UWSGI" "/container"
 
-    if [[ "$USE_PYTHON3" = "True" ]]; then
-        # Switch off glance->swift communication as swift fails under py3.x
-        iniset /etc/glance/glance-api.conf glance_store default_store file
+        if [[ "$USE_PYTHON3" = "True" ]]; then
+            # Switch off glance->swift communication as swift fails under py3.x
+            iniset /etc/glance/glance-api.conf glance_store default_store file
+        fi
     fi
 }