From 1a9929c5c3a8f0a816fc981f875effb1df5f8e34 Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Thu, 28 Mar 2019 13:28:05 -0500
Subject: [PATCH] Add wait.resources.type to armada manifest

This change adds various wait.resources.type to the armada
manifest for each openstack service.

Change-Id: I6015344c9fcf175bab076fc5c81dfe7778d421ee
---
 .../armada/manifests/armada-osh.yaml          | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/tools/deployment/armada/manifests/armada-osh.yaml b/tools/deployment/armada/manifests/armada-osh.yaml
index 8640117d14..8da3129e89 100644
--- a/tools/deployment/armada/manifests/armada-osh.yaml
+++ b/tools/deployment/armada/manifests/armada-osh.yaml
@@ -27,6 +27,8 @@ data:
     timeout: 1800
     labels:
       release_group: osh-openstack-ingress-controller
+    resources:
+      - type: deployment
   install:
     no_hooks: False
   upgrade:
@@ -121,6 +123,11 @@ data:
     timeout: 1800
     labels:
       release_group: osh-mariadb
+    resources:
+      - type: statefulset
+      - type: job
+    native:
+      enabled: false
   install:
     no_hooks: False
   upgrade:
@@ -167,6 +174,10 @@ data:
     timeout: 1800
     labels:
       release_group: osh-memcached
+    resources:
+      - type: deployment
+    native:
+      enabled: false
   install:
     no_hooks: False
   upgrade:
@@ -208,6 +219,11 @@ data:
     timeout: 1800
     labels:
       release_group: osh-rabbitmq
+    resources:
+      - type: statefulset
+      - type: job
+    native:
+      enabled: false
   test:
     enabled: true
     timeout: 600
@@ -265,6 +281,11 @@ data:
     timeout: 1800
     labels:
       release_group: osh-keystone
+    resources:
+      - type: deployment
+      - type: job
+    native:
+      enabled: false
   test:
     enabled: true
     timeout: 600
@@ -405,6 +426,11 @@ data:
     timeout: 1800
     labels:
       release_group: osh-glance
+    resources:
+      - type: deployment
+      - type: job
+    native:
+      enabled: false
   test:
     enabled: true
     timeout: 600
@@ -486,6 +512,11 @@ data:
     timeout: 1800
     labels:
       release_group: osh-cinder
+    resources:
+      - type: deployment
+      - type: job
+    native:
+      enabled: false
   test:
     enabled: true
     timeout: 600
@@ -574,6 +605,11 @@ data:
     timeout: 1800
     labels:
       release_group: osh-openvswitch
+    resources:
+      - type: daemonset
+        min_ready: 1
+    native:
+      enabled: false
   install:
     no_hooks: False
   upgrade:
@@ -606,8 +642,13 @@ data:
   release: libvirt
   namespace: openstack
   wait:
+    timeout: 1800
     labels:
       release_group: osh-libvirt
+    resources:
+      - type: daemonset
+    native:
+      enabled: false
   install:
     no_hooks: False
   upgrade:
@@ -639,6 +680,12 @@ data:
     timeout: 1800
     labels:
       release_group: osh-nova
+    resources:
+      - type: deployment
+      - type: daemonset
+      - type: job
+    native:
+      enabled: false
   test:
     enabled: true
     timeout: 900
@@ -801,6 +848,12 @@ data:
     timeout: 2400
     labels:
       release_group: osh-neutron
+    resources:
+      - type: deployment
+      - type: daemonset
+      - type: job
+    native:
+      enabled: false
   test:
     enabled: true
     timeout: 1200
@@ -933,6 +986,11 @@ data:
     timeout: 2400
     labels:
       release_group: osh-heat
+    resources:
+      - type: deployment
+      - type: job
+    native:
+      enabled: false
   test:
     enabled: true
     timeout: 1200