summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-05 06:50:57 +0000
committerGerrit Code Review <review@openstack.org>2017-04-05 06:50:57 +0000
commit3fe2f0e6fab2c5d216ec62a4233e091c7d74d13b (patch)
treea28f797f6ed37985fa2572810dd4a2ca5abebe84
parent15abac97d7783ca30067eb93ccfb20e1f07ced36 (diff)
parent152f029f38d53382b54ae4e0f2ee58ec48530fef (diff)
Merge "[ceph] Change radosgw frontend port"
-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 },