From b703ca1c37b80785752c35a9a427ac7629503f68 Mon Sep 17 00:00:00 2001
From: pengdake <19921207pq@gmail.com>
Date: Fri, 30 Nov 2018 23:33:53 +0800
Subject: [PATCH] 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>
---
 examples/keystone-manifest.yaml | 31 ++++++++++++++++++++++++++++---
 examples/tar_example.yaml       |  3 ++-
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/examples/keystone-manifest.yaml b/examples/keystone-manifest.yaml
index 00a12d07..3112be3a 100644
--- a/examples/keystone-manifest.yaml
+++ b/examples/keystone-manifest.yaml
@@ -27,7 +27,6 @@ data:
   chart_name: mariadb
   release: mariadb
   namespace: openstack
-  timeout: 3600
   wait:
     timeout: 3600
     labels:
@@ -53,7 +52,6 @@ data:
   chart_name: memcached
   release: memcached
   namespace: openstack
-  timeout: 100
   wait:
     timeout: 100
     labels:
@@ -72,6 +70,33 @@ data:
     - helm-toolkit
 ---
 schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: rabbitmq
+data:
+  chart_name: rabbitmq
+  test:
+    enabled: true
+  release: rabbitmq
+  namespace: openstack
+  wait:
+    timeout: 100
+    labels:
+      release_group: armada-rabbitmq
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  values: {}
+  source:
+    type: git
+    location: https://git.openstack.org/openstack/openstack-helm-infra
+    subpath: rabbitmq
+    reference: master
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
   name: keystone
@@ -81,7 +106,6 @@ data:
     enabled: true
   release: keystone
   namespace: openstack
-  timeout: 100
   wait:
     timeout: 100
     labels:
@@ -117,6 +141,7 @@ data:
   chart_group:
     - mariadb
     - memcached
+    - rabbitmq
 ---
 schema: armada/ChartGroup/v1
 metadata:
diff --git a/examples/tar_example.yaml b/examples/tar_example.yaml
index a0f13249..fa83f1af 100644
--- a/examples/tar_example.yaml
+++ b/examples/tar_example.yaml
@@ -23,7 +23,8 @@ data:
   chart_name: mariadb-tarball
   release: mariadb-tarball
   namespace: tarball
-  timeout: 3600
+  wait:
+    timeout: 3600
   install:
     no_hooks: false
   upgrade: