summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpengdake <19921207pq@gmail.com>2018-11-30 23:33:53 +0800
committerpengdake <19921207pq@gmail.com>2018-12-05 19:00:16 +0800
commitb703ca1c37b80785752c35a9a427ac7629503f68 (patch)
treea3a08c6a852ef910e60e6f6b3469558526b86952
parent709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4 (diff)
Add chart about rabbitmq and remove timeout from example
1. According to https://github.com/openstack/openstack-helm/blob/master/keystone/templates/job-rabbit-init.yaml, We need to add chart about rabbitmq. 2. Timeout is overridden by `wait.timout`, we should remove it from example manifest. Change-Id: Ia455886b2d2666e15a3454e9208cae89c3140826 Signed-off-by: pengdake <19921207pq@gmail.com>
Notes
Notes (review): Code-Review+2: Sean Eagan <sean.eagan@att.com> Code-Review+1: Evgeniy L <eli@mirantis.com> Code-Review+2: Scott Hussey <sthussey@att.com> Workflow+1: Scott Hussey <sthussey@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 04 Jan 2019 18:24:55 +0000 Reviewed-on: https://review.openstack.org/621491 Project: openstack/airship-armada Branch: refs/heads/master
-rw-r--r--examples/keystone-manifest.yaml31
-rw-r--r--examples/tar_example.yaml3
2 files changed, 30 insertions, 4 deletions
diff --git a/examples/keystone-manifest.yaml b/examples/keystone-manifest.yaml
index 00a12d0..3112be3 100644
--- a/examples/keystone-manifest.yaml
+++ b/examples/keystone-manifest.yaml
@@ -27,7 +27,6 @@ data:
27 chart_name: mariadb 27 chart_name: mariadb
28 release: mariadb 28 release: mariadb
29 namespace: openstack 29 namespace: openstack
30 timeout: 3600
31 wait: 30 wait:
32 timeout: 3600 31 timeout: 3600
33 labels: 32 labels:
@@ -53,7 +52,6 @@ data:
53 chart_name: memcached 52 chart_name: memcached
54 release: memcached 53 release: memcached
55 namespace: openstack 54 namespace: openstack
56 timeout: 100
57 wait: 55 wait:
58 timeout: 100 56 timeout: 100
59 labels: 57 labels:
@@ -74,6 +72,33 @@ data:
74schema: armada/Chart/v1 72schema: armada/Chart/v1
75metadata: 73metadata:
76 schema: metadata/Document/v1 74 schema: metadata/Document/v1
75 name: rabbitmq
76data:
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---
99schema: armada/Chart/v1
100metadata:
101 schema: metadata/Document/v1
77 name: keystone 102 name: keystone
78data: 103data:
79 chart_name: keystone 104 chart_name: keystone
@@ -81,7 +106,6 @@ data:
81 enabled: true 106 enabled: true
82 release: keystone 107 release: keystone
83 namespace: openstack 108 namespace: openstack
84 timeout: 100
85 wait: 109 wait:
86 timeout: 100 110 timeout: 100
87 labels: 111 labels:
@@ -117,6 +141,7 @@ data:
117 chart_group: 141 chart_group:
118 - mariadb 142 - mariadb
119 - memcached 143 - memcached
144 - rabbitmq
120--- 145---
121schema: armada/ChartGroup/v1 146schema: armada/ChartGroup/v1
122metadata: 147metadata:
diff --git a/examples/tar_example.yaml b/examples/tar_example.yaml
index a0f1324..fa83f1a 100644
--- a/examples/tar_example.yaml
+++ b/examples/tar_example.yaml
@@ -23,7 +23,8 @@ data:
23 chart_name: mariadb-tarball 23 chart_name: mariadb-tarball
24 release: mariadb-tarball 24 release: mariadb-tarball
25 namespace: tarball 25 namespace: tarball
26 timeout: 3600 26 wait:
27 timeout: 3600
27 install: 28 install:
28 no_hooks: false 29 no_hooks: false
29 upgrade: 30 upgrade: