From f7a3cfb7cee7a5e8cd5254554e44c7d828f21ce0 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Wed, 20 Feb 2019 14:58:48 -0600
Subject: [PATCH] Add stx-update to devstack plugin dependency list

Add the minimum dependency bits for devstack master, plus the
required stx-update plugin in the devstack job definition.

The remaining master/bionic stuff will be in a follow-up review.

Change-Id: Id6b4e3dad1fe54d66b2b5a3dbbe3983621943bb2
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
---
 .zuul.yaml        |  2 ++
 devstack/settings | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/.zuul.yaml b/.zuul.yaml
index 783db39c..ea50e0bb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -94,6 +94,7 @@
     timeout: 7800
     required-projects:
       - openstack/stx-fault
+      - openstack/stx-update
     vars:
       tox_envlist: functional
       devstack_services:
@@ -132,5 +133,6 @@
       devstack_plugins:
         stx-fault: git://git.starlingx.io/stx-fault
         stx-nfv: git://git.starlingx.io/stx-nfv
+        stx-update: git://git.starlingx.io/stx-update
       devstack_localrc:
         LIBS_FROM_GIT: keystone
diff --git a/devstack/settings b/devstack/settings
index e09c6661..bba51412 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,6 +1,12 @@
 #!/bin/bash
 # Devstack settings
 
+# This plugin enables StarlingX stx-update services and follows the
+# DevStack plugin contract:
+# https://docs.openstack.org/devstack/latest/plugins.html#plugin-sh-contract
+
+# Services
+
 # Defaults
 # --------
 
@@ -9,6 +15,11 @@ STX_NFV_NAME=stx-nfv
 ######### Plugin Specific ##########
 enable_service $STX_NFV_NAME
 
+# This must not use any variables to work properly in OpenStack's DevStack playbook
+define_plugin stx-nfv
+# This works for Zuul jobs using OpenStack's DevStack roles
+plugin_requires stx-nfv stx-update
+
 if is_service_enabled stx-nfv; then
     # Enable prerequisites here
     :