From 1bbfc5897f0809fccbca6ed69f102b3c71c326de Mon Sep 17 00:00:00 2001
From: Shuicheng Lin <shuicheng.lin@intel.com>
Date: Mon, 1 Apr 2019 20:39:44 +0800
Subject: [PATCH] [DevStack] Fix Zuul nfv devstack error

nfv requires fm-rest-api, and fm-rest-api requires cgtsclient in
stx-config.
Add stx-config and cgtsclient to jobs to fix the dependency issue.

Try adding WSME in fm-rest-api setup...

Depends-On: https://review.openstack.org/649321
Depends-On: https://review.openstack.org/#/c/649169/
Change-Id: I6ee1cad6aa400f5b763a77e588da40c9332f4acd
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
 .zuul.yaml        | 11 +++++++----
 devstack/settings |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index b2143b28..54d3abe3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -96,6 +96,7 @@
     required-projects:
       - openstack/barbican
       - openstack/python-barbicanclient
+      - openstack/stx-config
       - openstack/stx-fault
       - openstack/stx-integ
       - openstack/stx-metal
@@ -104,6 +105,7 @@
       tox_envlist: functional
       devstack_services:
         # StarlingX services
+        cgtsclient: true
         fm-common: true
         fm-api: true
         fm-rest-api: true
@@ -114,8 +116,9 @@
         nfv-client: true
       devstack_plugins:
         barbican: https://git.openstack.org/openstack/barbican
-        stx-fault: https:://git.starlingx.io/stx-fault
+        stx-config: https://git.starlingx.io/stx-config
+        stx-fault: https://git.starlingx.io/stx-fault
         stx-integ: https://git.starlingx.io/stx-integ
-        stx-metal: https:://git.starlingx.io/stx-metal
-        stx-nfv: https:://git.starlingx.io/stx-nfv
-        stx-update: https:://git.starlingx.io/stx-update
+        stx-metal: https://git.starlingx.io/stx-metal
+        stx-nfv: https://git.starlingx.io/stx-nfv
+        stx-update: https://git.starlingx.io/stx-update
diff --git a/devstack/settings b/devstack/settings
index 32ec52bd..2dce8596 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -33,7 +33,7 @@ if is_service_enabled stx-nfv; then
     :
 fi
 
-# NOTE(dtroyer): This needs to be refiend a bit yet, for example fo we want
+# NOTE(dtroyer): This needs to be refined a bit yet, for example fo we want
 #                to abort or just disable guest-agent and guest-server if the
 #                prereqs are not configured?
 if is_service_enabled guest-agent || is_service_enabled guest-server; then