From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 13 Feb 2018 18:43:46 +0000 (-0500)
Subject: qa/rgw: verify suite tests civetweb with ssl
X-Git-Tag: v13.0.2~14^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F20444%2Fhead;p=ceph.git

qa/rgw: verify suite tests civetweb with ssl

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/qa/suites/rgw/verify/frontend b/qa/suites/rgw/verify/frontend
deleted file mode 120000
index f67cecad0751..000000000000
--- a/qa/suites/rgw/verify/frontend
+++ /dev/null
@@ -1 +0,0 @@
-../../../rgw_frontend
\ No newline at end of file
diff --git a/qa/suites/rgw/verify/frontend/beast.yaml b/qa/suites/rgw/verify/frontend/beast.yaml
new file mode 120000
index 000000000000..d07a47b4f874
--- /dev/null
+++ b/qa/suites/rgw/verify/frontend/beast.yaml
@@ -0,0 +1 @@
+../../../../rgw_frontend/beast.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/verify/frontend/civetweb.yaml b/qa/suites/rgw/verify/frontend/civetweb.yaml
new file mode 120000
index 000000000000..48cea2e75634
--- /dev/null
+++ b/qa/suites/rgw/verify/frontend/civetweb.yaml
@@ -0,0 +1 @@
+../../../../rgw_frontend/civetweb.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/verify/frontend/civetweb_ssl.yaml b/qa/suites/rgw/verify/frontend/civetweb_ssl.yaml
new file mode 100644
index 000000000000..9d4368ee5391
--- /dev/null
+++ b/qa/suites/rgw/verify/frontend/civetweb_ssl.yaml
@@ -0,0 +1,21 @@
+overrides:
+  ssl:
+    root:
+      client: client.0
+      key-type: rsa:4096
+      cn: teuthology
+      install: [client.0, client.1]
+    rgw.client.0:
+      client: client.0
+      ca: root
+      embed-key: true
+    rgw.client.1:
+      client: client.1
+      ca: root
+      embed-key: true
+  rgw:
+    frontend: civetweb
+    client.0:
+      ssl certificate: rgw.client.0
+    client.1:
+      ssl certificate: rgw.client.1
diff --git a/qa/suites/rgw/verify/tasks/rgw_tests.yaml b/qa/suites/rgw/verify/tasks/rgw_tests.yaml
index ccc4988d9e79..be55267e5412 100644
--- a/qa/suites/rgw/verify/tasks/rgw_tests.yaml
+++ b/qa/suites/rgw/verify/tasks/rgw_tests.yaml
@@ -5,6 +5,7 @@ tasks:
 - install:
     flavor: notcmalloc
 - ceph:
+- ssl:
 - rgw:
     client.0:
       valgrind: [--tool=memcheck]