x
/
fuel-ccp-entrypoint
Code Issues Proposed changes

Merge "Adding cluster_domain config option"

This commit is contained in:
Jenkins 2016-11-29 09:00:30 +00:00 committed by Gerrit Code Review
parent 4a2927939d a06205dcb0
commit 739620ed84
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuel_ccp_entrypoint/start_script.py
View File

@ -225,7 +225,8 @@ def address(service, port=None, external=False, with_scheme=False):
addr = '%s:%s' % (VARIABLES['k8s_external_ip'], port['node'])
if addr is None:
addr = '%s.%s' % (service, VARIABLES['namespace'])
addr = '.'.join((service, VARIABLES['namespace'], 'svc',
VARIABLES['cluster_domain']))
if port:
addr = '%s:%s' % (addr, port['cont'])

3
fuel_ccp_entrypoint/tests/test_fuel_ccp_entrypoint.py
View File

@ -155,6 +155,7 @@ class TestGetETCDClient(base.TestCase):
start_script.VARIABLES = {
"role_name": "banana",
"namespace": "ccp",
"cluster_domain": 'cluster.local',
"etcd": {
"client_port": {
"cont": 1234
@ -169,7 +170,7 @@ class TestGetETCDClient(base.TestCase):
etcd_client = start_script.get_etcd_client()
self.assertIs(expected_value, etcd_client)
m_etcd.assert_called_once_with(
host=(('etcd.ccp', 1234),),
host=(('etcd.ccp.svc.cluster.local', 1234),),
allow_reconnect=True,
read_timeout=2)