From ed1c4217b12e3d7b2cf324b715bdbbd00839df2c Mon Sep 17 00:00:00 2001 From: Robert Church Date: Sat, 9 Mar 2019 23:16:56 -0500 Subject: [PATCH] Optimize the installation of ceph-pools-audit Removes any delays associated with the installation of ceph-pools-audit. This chart simply installs a CronJob to periodically review and adjust rbd pool replication based on the desired settings specified in the Ceph backend. Here, the dedicated chart group is removed, the chart is specified as part of the provisioner chart group, the provisioner chart group is now sequenced with ceph-pools-audit occurring after the rbd-provisioner, and the ceph-pools-audit waits for the rbd-provisioner app label. This results in the immediate installation of the chart and we remove the time delay in waiting for first run of the CronJob which could be up to five minutes. Change-Id: Icb8415e4206322df074e0f697a9d800414bd8394 Story: 2004520 Task: 29964 Signed-off-by: Robert Church --- .../stx-openstack-helm/centos/build_srpm.data | 2 +- .../stx-openstack-helm/manifests/manifest.yaml | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data b/kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data index 386586efcb..6cbd5c2cd4 100644 --- a/kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data +++ b/kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data @@ -1,3 +1,3 @@ SRC_DIR="stx-openstack-helm" COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/rbd-provisioner $PKG_BASE/../../../helm-charts/garbd $PKG_BASE/../../../helm-charts/ceph-pools-audit" -TIS_PATCH_VER=7 +TIS_PATCH_VER=8 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 b4089f4f0d..ebfc364d78 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 @@ -151,7 +151,7 @@ data: wait: timeout: 1800 labels: - app: ceph-pools-audit + app: rbd-provisioner install: no_hooks: false upgrade: @@ -160,7 +160,7 @@ data: delete: - type: job labels: - app: ceph-pools-audit + app: osh-openstack-ceph-pools-audit source: type: tar location: http://172.17.0.1/helm_charts/ceph-pools-audit-0.1.0.tgz @@ -2616,18 +2616,9 @@ metadata: name: provisioner data: description: "Provisioner" - sequenced: false + sequenced: true chart_group: - openstack-rbd-provisioner ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: ceph-pools-audit -data: - description: "Ceph pools audit" - sequenced: false - chart_group: - openstack-ceph-pools-audit --- schema: armada/ChartGroup/v1 @@ -2747,7 +2738,6 @@ data: - kube-system-ingress - openstack-ingress - provisioner - - ceph-pools-audit - openstack-mariadb - openstack-memcached - openstack-rabbitmq