openstack
/
magnum
Code Issues Proposed changes

Merge "Set swarm api_address protocol to tcp on all cases."

This commit is contained in:
Jenkins 2016-07-21 06:22:59 +00:00 committed by Gerrit Code Review
parent 8138075ef2 9c093da955
commit 21a74eeec7
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
magnum/drivers/swarm_fedora_atomic_v1/template_def.py
View File

@ -28,12 +28,10 @@ class SwarmApiAddressOutputMapping(template_def.OutputMapping):
output_value = self.get_output_value(stack)
if output_value is not None:
protocol = 'https'
if baymodel.tls_disabled:
protocol = 'tcp'
# Note(rocha): protocol should always be tcp as the docker
# command client does not handle https (see bug #1604812).
params = {
'protocol': protocol,
'protocol': 'tcp',
'address': output_value,
'port': DOCKER_PORT,
}

2
magnum/tests/unit/drivers/test_template_definition.py
View File

@ -433,7 +433,7 @@ class AtomicK8sTemplateDefinitionTestCase(base.TestCase):
def test_update_swarm_outputs_if_baymodel_is_secure(self):
address = 'updated_address'
protocol = 'https'
protocol = 'tcp'
port = '2376'
params = {
'protocol': protocol,