qa/rgw: abstract out barbican under 2-kms/

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

diff --git a/qa/suites/rgw/crypt/.qa b/qa/suites/rgw/crypt/.qa
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/suites/rgw/crypt/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file

diff --git a/qa/suites/rgw/crypt/0-cluster/.qa b/qa/suites/rgw/crypt/0-cluster/.qa
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/suites/rgw/crypt/0-cluster/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file

diff --git a/qa/suites/rgw/crypt/0-cluster/fixed-2.yaml b/qa/suites/rgw/crypt/0-cluster/fixed-2.yaml
new file mode 120000 (symlink)
index 0000000..cd0791a
--- /dev/null
+++ b/qa/suites/rgw/crypt/0-cluster/fixed-2.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-2.yaml
\ No newline at end of file

diff --git a/qa/suites/rgw/crypt/1-ceph-install/.qa b/qa/suites/rgw/crypt/1-ceph-install/.qa
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/suites/rgw/crypt/1-ceph-install/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file

diff --git a/qa/suites/rgw/crypt/1-ceph-install/install.yaml b/qa/suites/rgw/crypt/1-ceph-install/install.yaml
new file mode 100644 (file)
index 0000000..07a08b9
--- /dev/null
+++ b/qa/suites/rgw/crypt/1-ceph-install/install.yaml
@@ -0,0 +1,7 @@
+overrides:
+  ceph:
+    wait-for-scrub: false
+
+tasks:
+- install:
+- ceph:

diff --git a/qa/suites/rgw/crypt/2-kms/% b/qa/suites/rgw/crypt/2-kms/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rgw/crypt/2-kms/.qa b/qa/suites/rgw/crypt/2-kms/.qa
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/suites/rgw/crypt/2-kms/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file

diff --git a/qa/suites/rgw/crypt/2-kms/barbican.yaml b/qa/suites/rgw/crypt/2-kms/barbican.yaml
new file mode 100644 (file)
index 0000000..09a20db
--- /dev/null
+++ b/qa/suites/rgw/crypt/2-kms/barbican.yaml
@@ -0,0 +1,78 @@
+overrides:
+  rgw:
+    client.0:
+      use-keystone-role: client.0
+      use-barbican-role: client.0
+
+tasks:
+- keystone:
+    client.0:
+      sha1: 12.0.0.0b2
+      force-branch: master
+      tenants:
+        - name: admin
+          description:  Admin Tenant
+        - name: rgwcrypt
+          description: Encryption Tenant
+        - name: barbican
+          description: Barbican
+        - name: s3
+          description: S3 project
+      users:
+        - name: admin
+          password: ADMIN
+          project: admin
+        - name: rgwcrypt-user
+          password: rgwcrypt-pass
+          project: rgwcrypt
+        - name: barbican-user
+          password: barbican-pass
+          project: barbican
+        - name: s3-user
+          password: s3-pass
+          project: s3
+      roles: [ name: admin, name: Member, name: creator ]
+      role-mappings:
+        - name: admin
+          user: admin
+          project: admin
+        - name: Member
+          user: rgwcrypt-user
+          project: rgwcrypt
+        - name: admin
+          user: barbican-user
+          project: barbican
+        - name: creator
+          user: s3-user
+          project: s3
+      services:
+        - name: keystone
+          type: identity
+          description: Keystone Identity Service
+        - name: swift
+          type: object-store
+          description: Swift Service
+- barbican:
+    client.0:
+      force-branch: master
+      use-keystone-role: client.0
+      keystone_authtoken:
+        auth_plugin: password
+        username: barbican-user
+        password: barbican-pass
+        user_domain_name: Default
+      rgw_user:
+        tenantName: rgwcrypt
+        username: rgwcrypt-user
+        password: rgwcrypt-pass
+      secrets:
+        - name: my-key-1
+          base64: a2V5MS5GcWVxKzhzTGNLaGtzQkg5NGVpb1FKcFpGb2c=
+          tenantName: s3
+          username: s3-user
+          password: s3-pass
+        - name: my-key-2
+          base64: a2V5Mi5yNUNNMGFzMVdIUVZxcCt5NGVmVGlQQ1k4YWg=
+          tenantName: s3
+          username: s3-user
+          password: s3-pass

diff --git a/qa/suites/rgw/crypt/3-rgw/.qa b/qa/suites/rgw/crypt/3-rgw/.qa
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/suites/rgw/crypt/3-rgw/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file

diff --git a/qa/suites/rgw/crypt/3-rgw/rgw.yaml b/qa/suites/rgw/crypt/3-rgw/rgw.yaml
new file mode 100644 (file)
index 0000000..109c951
--- /dev/null
+++ b/qa/suites/rgw/crypt/3-rgw/rgw.yaml
@@ -0,0 +1,11 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rgw crypt require ssl: false
+        rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo=
+        debug rgw: 20
+
+tasks:
+- rgw:
+    client.0:

diff --git a/qa/suites/rgw/crypt/4-tests/+ b/qa/suites/rgw/crypt/4-tests/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rgw/crypt/4-tests/.qa b/qa/suites/rgw/crypt/4-tests/.qa
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/suites/rgw/crypt/4-tests/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file

diff --git a/qa/suites/rgw/crypt/4-tests/s3tests.yaml b/qa/suites/rgw/crypt/4-tests/s3tests.yaml
new file mode 100644 (file)
index 0000000..2a20ad2
--- /dev/null
+++ b/qa/suites/rgw/crypt/4-tests/s3tests.yaml
@@ -0,0 +1,5 @@
+tasks:
+- s3tests:
+    client.0:
+      force-branch: ceph-master
+      kms_key: my-key-1

diff --git a/qa/suites/rgw/crypt/clusters/fixed-2.yaml b/qa/suites/rgw/crypt/clusters/fixed-2.yaml
deleted file mode 120000 (symlink)
index cd0791a..0000000
--- a/qa/suites/rgw/crypt/clusters/fixed-2.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../clusters/fixed-2.yaml
\ No newline at end of file

diff --git a/qa/suites/rgw/crypt/kms.yaml b/qa/suites/rgw/crypt/kms.yaml
deleted file mode 100644 (file)
index 2771559..0000000
--- a/qa/suites/rgw/crypt/kms.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-    tasks:
-      - install:
-      - ceph:
-      - tox: [ client.0 ]
-      - keystone:
-          client.0:
-            sha1: 12.0.0.0b2
-            force-branch: master
-            tenants:
-              - name: admin
-                description:  Admin Tenant
-              - name: rgwcrypt
-                description: Encryption Tenant
-              - name: barbican
-                description: Barbican
-              - name: s3
-                description: S3 project
-            users:
-              - name: admin
-                password: ADMIN
-                project: admin
-              - name: rgwcrypt-user
-                password: rgwcrypt-pass
-                project: rgwcrypt
-              - name: barbican-user
-                password: barbican-pass
-                project: barbican
-              - name: s3-user
-                password: s3-pass
-                project: s3
-            roles: [ name: admin, name: Member, name: creator ]
-            role-mappings:
-              - name: admin
-                user: admin
-                project: admin
-              - name: Member
-                user: rgwcrypt-user
-                project: rgwcrypt
-              - name: admin
-                user: barbican-user
-                project: barbican
-              - name: creator
-                user: s3-user
-                project: s3
-            services:
-              - name: keystone
-                type: identity
-                description: Keystone Identity Service
-              - name: swift
-                type: object-store
-                description: Swift Service
-      - barbican:
-          client.0:
-            force-branch: master
-            use-keystone-role: client.0
-            keystone_authtoken:
-              auth_plugin: password
-              username: barbican-user
-              password: barbican-pass
-              user_domain_name: Default
-            rgw_user:
-              tenantName: rgwcrypt
-              username: rgwcrypt-user
-              password: rgwcrypt-pass
-            secrets:
-              - name: my-key-1
-                base64: a2V5MS5GcWVxKzhzTGNLaGtzQkg5NGVpb1FKcFpGb2c=
-                tenantName: s3
-                username: s3-user
-                password: s3-pass
-              - name: my-key-2
-                base64: a2V5Mi5yNUNNMGFzMVdIUVZxcCt5NGVmVGlQQ1k4YWg=
-                tenantName: s3
-                username: s3-user
-                password: s3-pass
-      - rgw:
-          client.0:
-            use-keystone-role: client.0
-            use-barbican-role: client.0
-      - s3tests:
-          client.0:
-            force-branch: master
-            kms_key: my-key-1

diff --git a/qa/suites/rgw/crypt/overrides.yaml b/qa/suites/rgw/crypt/overrides.yaml
deleted file mode 100644 (file)
index e3a1209..0000000
--- a/qa/suites/rgw/crypt/overrides.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-overrides:
-  ceph:
-    wait-for-scrub: false
-    conf:
-      client:
-        rgw crypt require ssl: false
-        rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo=
-        debug rgw: 20