From: Brad Hubbard <bhubbard@redhat.com>
Date: Sun, 18 Nov 2018 23:37:02 +0000 (+1000)
Subject: qa/ceph-ansible: Specify stable-3.2 branch
X-Git-Tag: v12.2.10~1^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F25170%2Fhead;p=ceph.git

qa/ceph-ansible: Specify stable-3.2 branch

Ceph-ansible no longer supports luminous post stable-3.2.

Fixes: https://tracker.ceph.com/issues/37331

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---

diff --git a/qa/suites/ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml b/qa/suites/ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml
index 36d0a07d997..5ca4bd6093f 100644
--- a/qa/suites/ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml
+++ b/qa/suites/ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml
@@ -4,6 +4,7 @@ meta:
 overrides:
    ceph_ansible:
      vars:
+        branch: stable-3.2
         ceph_conf_overrides:
           global:
             osd default pool size: 2
diff --git a/qa/suites/ceph-ansible/smoke/basic/3-config/bluestore_with_dmcrypt.yaml b/qa/suites/ceph-ansible/smoke/basic/3-config/bluestore_with_dmcrypt.yaml
index 604e757ad1c..b26c7392949 100644
--- a/qa/suites/ceph-ansible/smoke/basic/3-config/bluestore_with_dmcrypt.yaml
+++ b/qa/suites/ceph-ansible/smoke/basic/3-config/bluestore_with_dmcrypt.yaml
@@ -3,6 +3,7 @@ meta:
 
 overrides:
    ceph_ansible:
+     branch: stable-3.2
      vars:
         osd_objectstore: bluestore
         dmcrypt: True
diff --git a/qa/suites/ceph-ansible/smoke/basic/3-config/dmcrypt_off.yaml b/qa/suites/ceph-ansible/smoke/basic/3-config/dmcrypt_off.yaml
index 4bbd1c7c5d1..94bdf5fcbc9 100644
--- a/qa/suites/ceph-ansible/smoke/basic/3-config/dmcrypt_off.yaml
+++ b/qa/suites/ceph-ansible/smoke/basic/3-config/dmcrypt_off.yaml
@@ -3,5 +3,6 @@ meta:
 
 overrides:
    ceph_ansible:
+     branch: stable-3.2
      vars:
         dmcrypt: False
diff --git a/qa/suites/ceph-ansible/smoke/basic/3-config/dmcrypt_on.yaml b/qa/suites/ceph-ansible/smoke/basic/3-config/dmcrypt_on.yaml
index 12d63d32548..d60c4480bc6 100644
--- a/qa/suites/ceph-ansible/smoke/basic/3-config/dmcrypt_on.yaml
+++ b/qa/suites/ceph-ansible/smoke/basic/3-config/dmcrypt_on.yaml
@@ -3,5 +3,6 @@ meta:
 
 overrides:
    ceph_ansible:
+     branch: stable-3.2
      vars:
         dmcrypt: True