From 03ac59e545262223fb59315dd6bea141f3013af5 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Mon, 2 Mar 2015 14:48:46 -0600 Subject: [PATCH] Adds a set of rgw tests to the teuthology suite I added these so I could source control a good yaml fragment that I created to test rgw. Adding the suite allows me to test the addition of mod_proxy_fcgi across multiple distros. Signed-off-by: Andrew Schoen --- suites/teuthology/rgw/% | 0 suites/teuthology/rgw/distros/rhel7.0.yaml | 2 ++ .../teuthology/rgw/distros/ubuntu12.04.yaml | 2 ++ .../teuthology/rgw/distros/ubuntu14.04.yaml | 2 ++ .../teuthology/rgw/distros/vps_centos6.5.yaml | 3 +++ .../teuthology/rgw/distros/vps_debian7.yaml | 3 +++ .../teuthology/rgw/distros/vps_rhel6.5.yaml | 3 +++ .../teuthology/rgw/tasks/s3tests-fastcgi.yaml | 23 ++++++++++++++++ suites/teuthology/rgw/tasks/s3tests-fcgi.yaml | 26 +++++++++++++++++++ tasks/rgw.py | 5 ++++ 10 files changed, 69 insertions(+) create mode 100644 suites/teuthology/rgw/% create mode 100644 suites/teuthology/rgw/distros/rhel7.0.yaml create mode 100644 suites/teuthology/rgw/distros/ubuntu12.04.yaml create mode 100644 suites/teuthology/rgw/distros/ubuntu14.04.yaml create mode 100644 suites/teuthology/rgw/distros/vps_centos6.5.yaml create mode 100644 suites/teuthology/rgw/distros/vps_debian7.yaml create mode 100644 suites/teuthology/rgw/distros/vps_rhel6.5.yaml create mode 100644 suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml create mode 100644 suites/teuthology/rgw/tasks/s3tests-fcgi.yaml diff --git a/suites/teuthology/rgw/% b/suites/teuthology/rgw/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/teuthology/rgw/distros/rhel7.0.yaml b/suites/teuthology/rgw/distros/rhel7.0.yaml new file mode 100644 index 0000000000000..c87c0bc135b70 --- /dev/null +++ b/suites/teuthology/rgw/distros/rhel7.0.yaml @@ -0,0 +1,2 @@ +os_type: rhel +os_version: "7.0" diff --git a/suites/teuthology/rgw/distros/ubuntu12.04.yaml b/suites/teuthology/rgw/distros/ubuntu12.04.yaml new file mode 100644 index 0000000000000..dbc3a8d9c5879 --- /dev/null +++ b/suites/teuthology/rgw/distros/ubuntu12.04.yaml @@ -0,0 +1,2 @@ +os_type: ubuntu +os_version: "12.04" diff --git a/suites/teuthology/rgw/distros/ubuntu14.04.yaml b/suites/teuthology/rgw/distros/ubuntu14.04.yaml new file mode 100644 index 0000000000000..309e989feebd3 --- /dev/null +++ b/suites/teuthology/rgw/distros/ubuntu14.04.yaml @@ -0,0 +1,2 @@ +os_type: ubuntu +os_version: "14.04" diff --git a/suites/teuthology/rgw/distros/vps_centos6.5.yaml b/suites/teuthology/rgw/distros/vps_centos6.5.yaml new file mode 100644 index 0000000000000..9ff9e84d43487 --- /dev/null +++ b/suites/teuthology/rgw/distros/vps_centos6.5.yaml @@ -0,0 +1,3 @@ +machine_type: vps +os_type: centos +os_version: "6.5" diff --git a/suites/teuthology/rgw/distros/vps_debian7.yaml b/suites/teuthology/rgw/distros/vps_debian7.yaml new file mode 100644 index 0000000000000..7a3df798862cb --- /dev/null +++ b/suites/teuthology/rgw/distros/vps_debian7.yaml @@ -0,0 +1,3 @@ +machine_type: vps +os_type: debian +os_version: "7.0" diff --git a/suites/teuthology/rgw/distros/vps_rhel6.5.yaml b/suites/teuthology/rgw/distros/vps_rhel6.5.yaml new file mode 100644 index 0000000000000..f5bb7b83739b2 --- /dev/null +++ b/suites/teuthology/rgw/distros/vps_rhel6.5.yaml @@ -0,0 +1,3 @@ +machine_type: vps +os_type: rhel +os_version: "6.5" diff --git a/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml b/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml new file mode 100644 index 0000000000000..41cc3decf1517 --- /dev/null +++ b/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml @@ -0,0 +1,23 @@ +# this runs s3tests against rgw, using mod_fastcgi +roles: +- [mon.a, mon.c, osd.0, osd.1, osd.2, client.0] +- [mon.b, osd.3, osd.4, osd.5, client.1] + +tasks: +- install: + branch: master +- ceph: +- rgw: [client.0] +- s3tests: + client.0: + rgw_server: client.0 + force-branch: master +overrides: + ceph: + fs: ext4 + conf: + client: + debug rgw: 20 + rgw: + ec-data-pool: false + frontend: apache diff --git a/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml b/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml new file mode 100644 index 0000000000000..35d14b469522a --- /dev/null +++ b/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml @@ -0,0 +1,26 @@ +# this runs s3tests against rgw, using mod_proxy_fcgi +# the choice between uds or tcp with mod_proxy_fcgi depends on the distro +roles: +- [mon.a, mon.c, osd.0, osd.1, osd.2, client.0] +- [mon.b, osd.3, osd.4, osd.5, client.1] + +tasks: +- chef: +- install: + branch: master +- ceph: +- rgw: [client.0] +- s3tests: + client.0: + rgw_server: client.0 + force-branch: master +overrides: + ceph: + fs: ext4 + conf: + client: + debug rgw: 20 + rgw: + ec-data-pool: false + frontend: apache + use_fcgi: true diff --git a/tasks/rgw.py b/tasks/rgw.py index 2b8a43ac57d71..ef63db037ce52 100644 --- a/tasks/rgw.py +++ b/tasks/rgw.py @@ -124,11 +124,16 @@ def ship_apache_configs(ctx, config, role_endpoints): fcgi_config = os.path.join(template_dir, 'mod_proxy_fcgi.tcp.conf.template') if ctx.rgw.use_fastcgi: + log.info("Apache is configured to use mod_fastcgi") fcgi_config = os.path.join(template_dir, 'mod_fastcgi.conf.template') elif _use_uds_with_fcgi(remote): + log.info("Apache is configured to use mod_proxy_fcgi with UDS") fcgi_config = os.path.join(template_dir, 'mod_proxy_fcgi.uds.conf.template') + else: + log.info("Apache is configured to use mod_proxy_fcgi with TCP") + with file(fcgi_config, 'rb') as f: fcgi_config = f.read() with file(src, 'rb') as f: -- 2.39.5