Browse Source

Merge "Add chart about rabbitmq and remove timeout from example"

Zuul 3 months ago
parent
commit
e54da9c4b4
2 changed files with 30 additions and 4 deletions
  1. 28
    3
      examples/keystone-manifest.yaml
  2. 2
    1
      examples/tar_example.yaml

+ 28
- 3
examples/keystone-manifest.yaml View File

@@ -27,7 +27,6 @@ data:
27 27
   chart_name: mariadb
28 28
   release: mariadb
29 29
   namespace: openstack
30
-  timeout: 3600
31 30
   wait:
32 31
     timeout: 3600
33 32
     labels:
@@ -53,7 +52,6 @@ data:
53 52
   chart_name: memcached
54 53
   release: memcached
55 54
   namespace: openstack
56
-  timeout: 100
57 55
   wait:
58 56
     timeout: 100
59 57
     labels:
@@ -72,6 +70,33 @@ data:
72 70
     - helm-toolkit
73 71
 ---
74 72
 schema: armada/Chart/v1
73
+metadata:
74
+  schema: metadata/Document/v1
75
+  name: rabbitmq
76
+data:
77
+  chart_name: rabbitmq
78
+  test:
79
+    enabled: true
80
+  release: rabbitmq
81
+  namespace: openstack
82
+  wait:
83
+    timeout: 100
84
+    labels:
85
+      release_group: armada-rabbitmq
86
+  install:
87
+    no_hooks: false
88
+  upgrade:
89
+    no_hooks: false
90
+  values: {}
91
+  source:
92
+    type: git
93
+    location: https://git.openstack.org/openstack/openstack-helm-infra
94
+    subpath: rabbitmq
95
+    reference: master
96
+  dependencies:
97
+    - helm-toolkit
98
+---
99
+schema: armada/Chart/v1
75 100
 metadata:
76 101
   schema: metadata/Document/v1
77 102
   name: keystone
@@ -81,7 +106,6 @@ data:
81 106
     enabled: true
82 107
   release: keystone
83 108
   namespace: openstack
84
-  timeout: 100
85 109
   wait:
86 110
     timeout: 100
87 111
     labels:
@@ -117,6 +141,7 @@ data:
117 141
   chart_group:
118 142
     - mariadb
119 143
     - memcached
144
+    - rabbitmq
120 145
 ---
121 146
 schema: armada/ChartGroup/v1
122 147
 metadata:

+ 2
- 1
examples/tar_example.yaml View File

@@ -23,7 +23,8 @@ data:
23 23
   chart_name: mariadb-tarball
24 24
   release: mariadb-tarball
25 25
   namespace: tarball
26
-  timeout: 3600
26
+  wait:
27
+    timeout: 3600
27 28
   install:
28 29
     no_hooks: false
29 30
   upgrade:

Loading…
Cancel
Save