Merge "Fix Ceph deployment in apparmor job"

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

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: