From 2b5f2d97e03ace4a3d76e84714d6292b9bdd9026 Mon Sep 17 00:00:00 2001
From: Jaesang Lee <jaesang_lee@sk.com>
Date: Fri, 23 Mar 2018 16:18:02 +0900
Subject: [PATCH] Add gate for rbd storage backend.

This PS allows to test rbd storage backend when apply glance. Currently,
only radosgw is verified after ceph distribution.

Change-Id: Ia3c2c915a2e9a65b09123b8e1c47892069c9ae1b
Blueprint: add-rbd-gate
---
 .zuul.yaml                                    | 25 ++++++++++++++++---
 tools/deployment/developer/ceph/120-glance.sh |  3 ++-
 tools/gate/playbooks/dev-deploy-ceph.yaml     |  1 +
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index ddd78d5968..0aaf88c3e3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -16,7 +16,12 @@
     check:
       jobs:
         - openstack-helm-linter
-        - openstack-helm-dev-deploy-ceph-ovs:
+        - openstack-helm-dev-deploy-ceph-radosgw-ovs:
+            irrelevant-files:
+              - ^.*\.rst$
+              - ^doc/.*$
+              - ^releasenotes/.*$
+        - openstack-helm-dev-deploy-ceph-rbd-ovs:
             irrelevant-files:
               - ^.*\.rst$
               - ^doc/.*$
@@ -99,7 +104,12 @@
               - ^.*\.rst$
               - ^doc/.*$
               - ^releasenotes/.*$
-        - openstack-helm-dev-deploy-ceph-ovs:
+        - openstack-helm-dev-deploy-ceph-radosgw-ovs:
+            irrelevant-files:
+              - ^.*\.rst$
+              - ^doc/.*$
+              - ^releasenotes/.*$
+        - openstack-helm-dev-deploy-ceph-rbd-ovs:
             irrelevant-files:
               - ^.*\.rst$
               - ^doc/.*$
@@ -139,7 +149,16 @@
     nodeset: openstack-helm-single-node
 
 - job:
-    name: openstack-helm-dev-deploy-ceph-ovs
+    name: openstack-helm-dev-deploy-ceph-radosgw-ovs
+    vars:
+      zuul_glance_backend: radosgw
+    parent: openstack-helm-dev-deploy
+    run: tools/gate/playbooks/dev-deploy-ceph.yaml
+
+- job:
+    name: openstack-helm-dev-deploy-ceph-rbd-ovs
+    vars:
+      zuul_glance_backend: rbd
     parent: openstack-helm-dev-deploy
     run: tools/gate/playbooks/dev-deploy-ceph.yaml
 
diff --git a/tools/deployment/developer/ceph/120-glance.sh b/tools/deployment/developer/ceph/120-glance.sh
index 6ca7822ae3..9234d835d7 100755
--- a/tools/deployment/developer/ceph/120-glance.sh
+++ b/tools/deployment/developer/ceph/120-glance.sh
@@ -21,7 +21,8 @@ make pull-images glance
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
-GLANCE_BACKEND="radosgw" # NOTE(portdirect), this could be: radosgw, rbd, swift or pvc
+#NOTE(portdirect), this could be: radosgw, rbd, swift or pvc
+: ${GLANCE_BACKEND:="radosgw"}
 helm upgrade --install glance ./glance \
   --namespace=openstack \
   --set storage=${GLANCE_BACKEND} \
diff --git a/tools/gate/playbooks/dev-deploy-ceph.yaml b/tools/gate/playbooks/dev-deploy-ceph.yaml
index 02536797a4..082e9a05c8 100644
--- a/tools/gate/playbooks/dev-deploy-ceph.yaml
+++ b/tools/gate/playbooks/dev-deploy-ceph.yaml
@@ -135,6 +135,7 @@
       environment:
         OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
         OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
+        GLANCE_BACKEND: "{{ zuul_glance_backend | default('') }}"
       args:
         chdir: "{{ zuul.project.src_dir }}"
     # - name: Deploy Cinder