From: Warren Usui <warren.usui@inktank.com>
Date: Wed, 17 Dec 2014 06:01:26 +0000 (-0800)
Subject: Remove sepia dependency (use fqdn)
X-Git-Tag: v0.91~24^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3212%2Fhead;p=ceph.git

Remove sepia dependency (use fqdn)

Fixes: #10255
Signed-off-by: Warren Usui <warren.usui@inktank.com>
---

diff --git a/qa/workunits/rgw/s3_bucket_quota.pl b/qa/workunits/rgw/s3_bucket_quota.pl
index ae6e273a17af..1b607ac70ae1 100755
--- a/qa/workunits/rgw/s3_bucket_quota.pl
+++ b/qa/workunits/rgw/s3_bucket_quota.pl
@@ -37,6 +37,7 @@ use Pod::Usage();
 use FindBin;
 use lib $FindBin::Bin;
 use s3_utilities;
+use Net::Domain qw(hostfqdn);
 
 my $help;
 
@@ -51,10 +52,9 @@ my $mytestfilename1;
 my $logmsg;
 my $kruft;
 my $s3;
-my $domain   = "front.sepia.ceph.com";
-my $host     = get_hostname();
+my $hostdom  = $ENV{RGW_FQDN}||hostfqdn();
 my $port     = $ENV{RGW_PORT}||7280;
-our $hostname = "$host.$domain:$port";
+our $hostname = "$hostdom:$port";
 our $testfileloc;
 my $rgw_user = "qa_user";
 
diff --git a/qa/workunits/rgw/s3_multipart_upload.pl b/qa/workunits/rgw/s3_multipart_upload.pl
index 58be2aeae01d..5bf7af23b14a 100755
--- a/qa/workunits/rgw/s3_multipart_upload.pl
+++ b/qa/workunits/rgw/s3_multipart_upload.pl
@@ -36,6 +36,7 @@ use Pod::Usage();
 use FindBin;
 use lib $FindBin::Bin;
 use s3_utilities;
+use Net::Domain qw(hostfqdn);
 
 my $help;
 
@@ -46,10 +47,9 @@ Pod::Usage::pod2usage(-verbose => 1) && exit if ($help);
 
 #== local variables ===
 my $s3;
-my $domain   = "front.sepia.ceph.com";
-my $host     = get_hostname();
+my $hostdom  = $ENV{RGW_FQDN}||hostfqdn();
 my $port     = $ENV{RGW_PORT}||7280;
-our $hostname = "$host.$domain:$port";
+our $hostname = "$hostdom:$port";
 our $testfileloc;
 our $mytestfilename;
 
diff --git a/qa/workunits/rgw/s3_user_quota.pl b/qa/workunits/rgw/s3_user_quota.pl
index 045d297a701b..04d352ddff22 100755
--- a/qa/workunits/rgw/s3_user_quota.pl
+++ b/qa/workunits/rgw/s3_user_quota.pl
@@ -36,6 +36,7 @@ use Pod::Usage();
 use FindBin;
 use lib $FindBin::Bin;
 use s3_utilities;
+use Net::Domain qw(hostfqdn);
 
 my $help;
 
@@ -50,10 +51,9 @@ my $mytestfilename1;
 my $logmsg;
 my $kruft;
 my $s3;
-my $domain   = "front.sepia.ceph.com";
-my $host     = get_hostname();
+my $hostdom  = $ENV{RGW_FQDN}||hostfqdn();
 my $port     = $ENV{RGW_PORT}||7280;
-our $hostname = "$host.$domain:$port";
+our $hostname = "$hostdom:$port";
 our $testfileloc;
 our $cnt;