Merge "Add wait.resources.type to armada manifest"

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:
@@ -171,6 +178,10 @@ data:
     timeout: 1800
     labels:
       release_group: osh-memcached
+    resources:
+      - type: deployment
+    native:
+      enabled: false
   install:
     no_hooks: False
   upgrade:
@@ -212,6 +223,11 @@ data:
     timeout: 1800
     labels:
       release_group: osh-rabbitmq
+    resources:
+      - type: statefulset
+      - type: job
+    native:
+      enabled: false
   test:
     enabled: true
     timeout: 600
@@ -269,6 +285,11 @@ data:
     timeout: 1800
     labels:
       release_group: osh-keystone
+    resources:
+      - type: deployment
+      - type: job
+    native:
+      enabled: false
   test:
     enabled: true
     timeout: 600
@@ -411,6 +432,11 @@ data:
     timeout: 1800
     labels:
       release_group: osh-glance
+    resources:
+      - type: deployment
+      - type: job
+    native:
+      enabled: false
   test:
     enabled: true
     timeout: 600
@@ -494,6 +520,11 @@ data:
     timeout: 1800
     labels:
       release_group: osh-cinder
+    resources:
+      - type: deployment
+      - type: job
+    native:
+      enabled: false
   test:
     enabled: true
     timeout: 600
@@ -584,6 +615,11 @@ data:
     timeout: 1800
     labels:
       release_group: osh-openvswitch
+    resources:
+      - type: daemonset
+        min_ready: 1
+    native:
+      enabled: false
   install:
     no_hooks: False
   upgrade:
@@ -616,8 +652,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:
@@ -649,6 +690,12 @@ data:
     timeout: 1800
     labels:
       release_group: osh-nova
+    resources:
+      - type: deployment
+      - type: daemonset
+      - type: job
+    native:
+      enabled: false
   test:
     enabled: true
     timeout: 900
@@ -813,6 +860,12 @@ data:
     timeout: 2400
     labels:
       release_group: osh-neutron
+    resources:
+      - type: deployment
+      - type: daemonset
+      - type: job
+    native:
+      enabled: false
   test:
     enabled: true
     timeout: 1200
@@ -947,6 +1000,11 @@ data:
     timeout: 2400
     labels:
       release_group: osh-heat
+    resources:
+      - type: deployment
+      - type: job
+    native:
+      enabled: false
   test:
     enabled: true
     timeout: 1200