From 3d993317599be37b15bbd8162bb7df652bfac8cd Mon Sep 17 00:00:00 2001 From: Angie Wang Date: Wed, 14 Nov 2018 20:24:33 -0500 Subject: [PATCH] Add Aodh and Panko to the armada manifests Aodh and panko charts are added to the openstack-telemetry chart group, but openstack-telemetry group still needs to be temporarily disabled as gnocchi requires ceph storage which is not supported in 2 nodes confiugration yet. In the meantime, user will need to manually enable openstack-telemetry in the armada-manifest chart groups. Change-Id: Ia8f4ad7ddbe85a54b6774d3df1666d3fc858c8ca Depends-On: https://review.openstack.org/#/c/618006/ Story: 2003909 Task: 27083 Signed-off-by: Angie Wang --- .../manifests/manifest-no-tests.yaml | 90 +++++++++++++++++++ .../manifests/manifest.yaml | 90 +++++++++++++++++++ 2 files changed, 180 insertions(+) diff --git a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml index 9d9be6b3ca..ca4341c8d6 100644 --- a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml +++ b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml @@ -744,6 +744,50 @@ data: - helm-toolkit --- schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + name: openstack-aodh +data: + chart_name: aodh + release: openstack-aodh + namespace: openstack + wait: + timeout: 1800 + labels: + release_group: osh-openstack-aodh + test: + enabled: false + install: + no_hooks: false + upgrade: + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: osh-openstack-aodh + - type: pod + labels: + release_group: osh-openstack-aodh + component: test + values: + pod: + user: + aodh: + uid: 0 + jobs: + alarms_cleaner: + # daily at the 35 minute mark + cron: "35 */24 * * *" + source: + type: tar + location: http://172.17.0.1/helm_charts/aodh-0.1.0.tgz + subpath: aodh + reference: master + dependencies: + - helm-toolkit +--- +schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: openstack-gnocchi @@ -840,6 +884,50 @@ data: - helm-toolkit --- schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + name: openstack-panko +data: + chart_name: panko + release: openstack-panko + namespace: openstack + wait: + timeout: 1800 + labels: + release_group: osh-openstack-panko + test: + enabled: false + install: + no_hooks: false + upgrade: + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: osh-openstack-panko + - type: pod + labels: + release_group: osh-openstack-panko + component: test + values: + pod: + user: + panko: + uid: 0 + jobs: + events_cleaner: + # hourly at the 10 minute mark + cron: "10 * * * *" + source: + type: tar + location: http://172.17.0.1/helm_charts/panko-0.1.0.tgz + subpath: panko + reference: master + dependencies: + - helm-toolkit +--- +schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: openstack-ceilometer @@ -2420,7 +2508,9 @@ data: description: "Deploy telemetry" sequenced: true chart_group: + - openstack-aodh - openstack-gnocchi + - openstack-panko - openstack-ceilometer --- schema: armada/Manifest/v1 diff --git a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml index a94a59d1bd..e02a1d5630 100644 --- a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml +++ b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml @@ -742,6 +742,50 @@ data: - helm-toolkit --- schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + name: openstack-aodh +data: + chart_name: aodh + release: openstack-aodh + namespace: openstack + wait: + timeout: 1800 + labels: + release_group: osh-openstack-aodh + test: + enabled: true + install: + no_hooks: false + upgrade: + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: osh-openstack-aodh + - type: pod + labels: + release_group: osh-openstack-aodh + component: test + values: + pod: + user: + aodh: + uid: 0 + jobs: + alarms_cleaner: + # daily at the 35 minute mark + cron: "35 */24 * * *" + source: + type: tar + location: http://172.17.0.1/helm_charts/aodh-0.1.0.tgz + subpath: aodh + reference: master + dependencies: + - helm-toolkit +--- +schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: openstack-gnocchi @@ -838,6 +882,50 @@ data: - helm-toolkit --- schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + name: openstack-panko +data: + chart_name: panko + release: openstack-panko + namespace: openstack + wait: + timeout: 1800 + labels: + release_group: osh-openstack-panko + test: + enabled: true + install: + no_hooks: false + upgrade: + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: osh-openstack-panko + - type: pod + labels: + release_group: osh-openstack-panko + component: test + values: + pod: + user: + panko: + uid: 0 + jobs: + events_cleaner: + # hourly at the 10 minute mark + cron: "10 * * * *" + source: + type: tar + location: http://172.17.0.1/helm_charts/panko-0.1.0.tgz + subpath: panko + reference: master + dependencies: + - helm-toolkit +--- +schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: openstack-ceilometer @@ -2418,7 +2506,9 @@ data: description: "Deploy telemetry" sequenced: true chart_group: + - openstack-aodh - openstack-gnocchi + - openstack-panko - openstack-ceilometer --- schema: armada/Manifest/v1