summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-03-28 12:40:03 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-03-28 12:40:03 +0400
commit152f029f38d53382b54ae4e0f2ee58ec48530fef (patch)
tree82811a78b8f40287c37b796aba0d54853cb08e0c
parent4fec779c4f537d07d8a2635900ecf1ecaf535fba (diff)
[ceph] Change radosgw frontend port
Set radosgw listen port to default value of built-in frontend. Change-Id: I4ddcba69018238001df9b00b9e4174de3a9840c9 Related-Bug: #1674917
Notes
Notes (review): Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+2: Vladimir Khlyunev <vkhlyunev@mirantis.com> Code-Review+1: Alexey Stepanov <penguinolog@gmail.com> Workflow+1: Alexey Stepanov <penguinolog@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 05 Apr 2017 06:50:57 +0000 Reviewed-on: https://review.openstack.org/450638 Project: openstack/fuel-qa Branch: refs/heads/master
-rw-r--r--fuelweb_test/tests/test_ceph.py4
-rw-r--r--fuelweb_test/tests/test_net_templates_base.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/fuelweb_test/tests/test_ceph.py b/fuelweb_test/tests/test_ceph.py
index a89712a..3eb0c5d 100644
--- a/fuelweb_test/tests/test_ceph.py
+++ b/fuelweb_test/tests/test_ceph.py
@@ -1114,13 +1114,13 @@ class RadosGW(TestBasic):
1114 self.ssh_manager.execute_on_remote( 1114 self.ssh_manager.execute_on_remote(
1115 ip=node['ip'], 1115 ip=node['ip'],
1116 cmd="s3cmd --access_key={0} --secret_key={1} " 1116 cmd="s3cmd --access_key={0} --secret_key={1} "
1117 "--no-ssl --host={2}:6780 mb s3://test_bucket".format( 1117 "--no-ssl --host={2}:7480 mb s3://test_bucket".format(
1118 access_key, secret_key, pub_contr_ip)) 1118 access_key, secret_key, pub_contr_ip))
1119 1119
1120 result = self.ssh_manager.execute_on_remote( 1120 result = self.ssh_manager.execute_on_remote(
1121 ip=node['ip'], 1121 ip=node['ip'],
1122 cmd="{0} --access_key={1} --secret_key={2} " 1122 cmd="{0} --access_key={1} --secret_key={2} "
1123 "--no-ssl --host={3}:6780 ls".format( 1123 "--no-ssl --host={3}:7480 ls".format(
1124 settings.S3_API_CLIENT, access_key, secret_key, 1124 settings.S3_API_CLIENT, access_key, secret_key,
1125 pub_contr_ip)) 1125 pub_contr_ip))
1126 1126
diff --git a/fuelweb_test/tests/test_net_templates_base.py b/fuelweb_test/tests/test_net_templates_base.py
index 819723b..748b466 100644
--- a/fuelweb_test/tests/test_net_templates_base.py
+++ b/fuelweb_test/tests/test_net_templates_base.py
@@ -323,7 +323,7 @@ class TestNetworkTemplatesBase(TestBasic):
323 { 323 {
324 'name': 'ceph-radosgw', 324 'name': 'ceph-radosgw',
325 'network_roles': ['ceph/radosgw'], 325 'network_roles': ['ceph/radosgw'],
326 'tcp_ports': [6780], 326 'tcp_ports': [7480],
327 'udp_ports': [], 327 'udp_ports': [],
328 'enabled': True 328 'enabled': True
329 }, 329 },