Adding service-per-service support
Entrypoint part for service-per-service deployment. Change-Id: I16e370cbe11c38dc8746a66e43329c26cbc51395 Depends-On: I274826648390b844d240b7ae545c40264f662452
This commit is contained in:
parent
254a89bbb3
commit
5bab96409b
|
@ -236,6 +236,15 @@ def address(service, port=None, external=False, with_scheme=False):
|
||||||
elif port.get('node'):
|
elif port.get('node'):
|
||||||
addr = '%s:%s' % (VARIABLES['k8s_external_ip'], port['node'])
|
addr = '%s:%s' % (VARIABLES['k8s_external_ip'], port['node'])
|
||||||
|
|
||||||
|
current_service = VARIABLES['service_name']
|
||||||
|
if current_service:
|
||||||
|
current_service_def = VARIABLES['services'].get(
|
||||||
|
current_service, {}).get('service_def')
|
||||||
|
if current_service_def == service:
|
||||||
|
service = current_service
|
||||||
|
else:
|
||||||
|
service = VARIABLES['services'].get(current_service, {}).get(
|
||||||
|
'mapping', {}).get(service) or service
|
||||||
if addr is None:
|
if addr is None:
|
||||||
addr = '.'.join((service, VARIABLES['namespace'], 'svc',
|
addr = '.'.join((service, VARIABLES['namespace'], 'svc',
|
||||||
VARIABLES['cluster_domain']))
|
VARIABLES['cluster_domain']))
|
||||||
|
@ -523,6 +532,7 @@ def get_variables(role_name):
|
||||||
LOG.debug("Creating network topology ")
|
LOG.debug("Creating network topology ")
|
||||||
variables["network_topology"] = create_network_topology(meta_info,
|
variables["network_topology"] = create_network_topology(meta_info,
|
||||||
variables)
|
variables)
|
||||||
|
variables["service_name"] = meta_info.get('service-name')
|
||||||
return variables
|
return variables
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -99,7 +99,8 @@ class TestGetVariables(base.TestCase):
|
||||||
'node_name': 'node1',
|
'node_name': 'node1',
|
||||||
'pod_name': 'pod1',
|
'pod_name': 'pod1',
|
||||||
'cpu_limit': '4',
|
'cpu_limit': '4',
|
||||||
'memory_limit': '7859277824'
|
'memory_limit': '7859277824',
|
||||||
|
'service_name': None
|
||||||
}
|
}
|
||||||
self.assertEqual(r_value, e_value)
|
self.assertEqual(r_value, e_value)
|
||||||
|
|
||||||
|
@ -153,6 +154,7 @@ class TestGetVariables(base.TestCase):
|
||||||
'cpu_limit': '4',
|
'cpu_limit': '4',
|
||||||
'memory_limit': '7859277824',
|
'memory_limit': '7859277824',
|
||||||
'pod_name': 'pod1',
|
'pod_name': 'pod1',
|
||||||
|
'service_name': None,
|
||||||
'a': {
|
'a': {
|
||||||
'b': {
|
'b': {
|
||||||
'c': ['e', 'f', 't'],
|
'c': ['e', 'f', 't'],
|
||||||
|
@ -235,6 +237,8 @@ class TestGetETCDClient(base.TestCase):
|
||||||
"role_name": "banana",
|
"role_name": "banana",
|
||||||
"namespace": "ccp",
|
"namespace": "ccp",
|
||||||
"cluster_domain": 'cluster.local',
|
"cluster_domain": 'cluster.local',
|
||||||
|
"services": {},
|
||||||
|
"service_name": "test",
|
||||||
"etcd": {
|
"etcd": {
|
||||||
"tls": {
|
"tls": {
|
||||||
"enabled": False
|
"enabled": False
|
||||||
|
@ -263,6 +267,8 @@ class TestGetETCDClient(base.TestCase):
|
||||||
"role_name": "banana",
|
"role_name": "banana",
|
||||||
"namespace": "ccp",
|
"namespace": "ccp",
|
||||||
"cluster_domain": 'cluster.local',
|
"cluster_domain": 'cluster.local',
|
||||||
|
"services": {},
|
||||||
|
"service_name": "test",
|
||||||
"etcd": {
|
"etcd": {
|
||||||
"tls": {
|
"tls": {
|
||||||
"enabled": True
|
"enabled": True
|
||||||
|
|
Loading…
Reference in New Issue