From 880f32f059933871887f902b03c531b7c7d85076 Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Tue, 23 Apr 2019 10:25:54 -0500 Subject: [PATCH] Fix Ceph deployment in apparmor job This fixes the ceph deployment in the apparmor job as the previous overrides weren't entirely correct. This also reorders the deployment steps in the apparmor job to enforce the sequential naming scheme used Change-Id: I161bae649d4ff67307abeadc12b3c7d321af31c7 --- tools/deployment/apparmor/020-ceph.sh | 2 +- zuul.d/jobs.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/deployment/apparmor/020-ceph.sh b/tools/deployment/apparmor/020-ceph.sh index bf3b86a0a9..248a6ed0a3 100755 --- a/tools/deployment/apparmor/020-ceph.sh +++ b/tools/deployment/apparmor/020-ceph.sh @@ -206,7 +206,7 @@ for CHART in ceph-mon ceph-client ceph-provisioners; do done helm upgrade --install ceph-osd ./ceph-osd \ --namespace=ceph \ - --set pod.replicas.server=1 \ + --values=/tmp/ceph.yaml \ --values=/tmp/ceph-osd.yaml #NOTE: Wait for deploy diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 8addff6560..5de70ded2e 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -208,11 +208,11 @@ - ./tools/deployment/apparmor/000-install-packages.sh - ./tools/deployment/apparmor/001-setup-apparmor-profiles.sh - ./tools/deployment/apparmor/005-deploy-k8s.sh + - ./tools/deployment/apparmor/020-ceph.sh - ./tools/deployment/apparmor/040-memcached.sh - ./tools/deployment/apparmor/060-prometheus-node-exporter.sh - ./tools/deployment/apparmor/070-prometheus-openstack-exporter.sh - ./tools/deployment/apparmor/080-prometheus-process-exporter.sh - - ./tools/deployment/apparmor/020-ceph.sh - job: