From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 16 Mar 2018 20:33:09 +0000 (-0400)
Subject: qa/rgw: verify suite tests beast with ssl
X-Git-Tag: v13.1.0~394^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=35fd4050b7e184985585466b40ac8c04e02301f2;p=ceph.git

qa/rgw: verify suite tests beast with ssl

instead of adding special frontend configs like civetweb_ssl.yaml and
beast_ssl.yaml, added a new proto/ subdirectory for http.yaml and
https.yaml

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

diff --git a/qa/suites/rgw/verify/frontend b/qa/suites/rgw/verify/frontend
new file mode 120000
index 00000000000..f67cecad075
--- /dev/null
+++ b/qa/suites/rgw/verify/frontend
@@ -0,0 +1 @@
+../../../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
deleted file mode 120000
index d07a47b4f87..00000000000
--- a/qa/suites/rgw/verify/frontend/beast.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../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
deleted file mode 120000
index 48cea2e7563..00000000000
--- a/qa/suites/rgw/verify/frontend/civetweb.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../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
deleted file mode 100644
index c0e83524a82..00000000000
--- a/qa/suites/rgw/verify/frontend/civetweb_ssl.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-overrides:
-  openssl_keys:
-    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/proto/http.yaml b/qa/suites/rgw/verify/proto/http.yaml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/rgw/verify/proto/https.yaml b/qa/suites/rgw/verify/proto/https.yaml
new file mode 100644
index 00000000000..fb6b65206a7
--- /dev/null
+++ b/qa/suites/rgw/verify/proto/https.yaml
@@ -0,0 +1,20 @@
+overrides:
+  openssl_keys:
+    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:
+    client.0:
+      ssl certificate: rgw.client.0
+    client.1:
+      ssl certificate: rgw.client.1