From 010faee9d541a11f545126b5c15843dc5d12e9a7 Mon Sep 17 00:00:00 2001
From: Meg Heisler <mh783g@att.com>
Date: Mon, 1 Apr 2019 12:18:47 -0500
Subject: [PATCH] Add wait.resource for LMA services to armada manifest

This adds the wait.resource.type to each LMA service in
the armada manifest

Change-Id: I86adbb1a5325ce2beef8506a406865e8db53876b
---
 .../armada/manifests/armada-lma.yaml          | 25 +++++++++++++++++--
 zuul.d/project.yaml                           |  2 +-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/tools/deployment/armada/manifests/armada-lma.yaml b/tools/deployment/armada/manifests/armada-lma.yaml
index b27ee9e5b..5a6029eda 100644
--- a/tools/deployment/armada/manifests/armada-lma.yaml
+++ b/tools/deployment/armada/manifests/armada-lma.yaml
@@ -220,6 +220,9 @@ data:
     timeout: 1800
     labels:
       release_group: osh-infra-osh-infra-mariadb
+    resources:
+      - type: deployment
+      - type: statefulset
   install:
     no_hooks: False
   upgrade:
@@ -261,6 +264,10 @@ data:
     timeout: 3600
     labels:
       release_group: osh-infra-elasticsearch
+    resources:
+      - type: deployment
+      - type: job
+      - type: statefulset
   test:
     enabled: true
   install:
@@ -334,6 +341,10 @@ data:
     timeout: 3600
     labels:
       release_group: osh-infra-fluent-logging
+    resources:
+      - type: daemonset
+      - type: deployment
+      - type: job
   test:
     enabled: true
   install:
@@ -850,6 +861,9 @@ data:
     timeout: 1800
     labels:
       release_group: osh-infra-kibana
+    resources:
+      - type: deployment
+      - type: job
   install:
     no_hooks: False
   upgrade:
@@ -902,9 +916,11 @@ data:
   release: prometheus
   namespace: osh-infra
   wait:
-    timeout: 1800
+    timeout: 3600
     labels:
       release_group: osh-infra-prometheus
+    resources:
+      - type: statefulset
   test:
     enabled: true
   install:
@@ -1071,9 +1087,11 @@ data:
   release: nagios
   namespace: osh-infra
   wait:
-    timeout: 1800
+    timeout: 2400
     labels:
       release_group: osh-infra-nagios
+    resources:
+      - type: deployment
   install:
     no_hooks: False
   upgrade:
@@ -1121,6 +1139,9 @@ data:
     timeout: 1800
     labels:
       release_group: osh-infra-grafana
+    resources:
+      - type: deployment
+      - type: job
   test:
     enabled: true
   install:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 4925d0f35..c7b865e23 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -57,4 +57,4 @@
         - openstack-helm-infra-elastic-beats
         - openstack-helm-infra-armada-deploy
         - openstack-helm-infra-armada-update-uuid
-        - openstack-helm-infra-armada-update-passwords
+        - openstack-helm-infra-armada-update-passwords
\ No newline at end of file