openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Avoid using deprecated TLS endpoint files in undercloud config"

Browse Source
This commit is contained in:
Zuul
2018-04-21 07:21:22 +00:00
committed by Gerrit Code Review
parent ac215a9ae4 e2de680880
commit 8df171d7ad
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tripleoclient/tests/v1/undercloud/test_undercloud.py
View File

@@ -84,7 +84,7 @@ class TestUndercloudInstall(TestPluginV1):
'--public-virtual-ip', '192.168.24.2', '--public-virtual-ip', '192.168.24.2',
'--control-virtual-ip', '192.168.24.3', '-e', '--control-virtual-ip', '192.168.24.3', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'tls-endpoints-public-ip.yaml', '-e', 'ssl/tls-endpoints-public-ip.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e', 'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
@@ -133,7 +133,7 @@ class TestUndercloudInstall(TestPluginV1):
'--public-virtual-ip', '192.168.24.2', '--public-virtual-ip', '192.168.24.2',
'--control-virtual-ip', '192.168.24.3', '-e', '--control-virtual-ip', '192.168.24.3', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'tls-endpoints-public-ip.yaml', '-e', 'ssl/tls-endpoints-public-ip.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e', 'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
@@ -184,7 +184,7 @@ class TestUndercloudInstall(TestPluginV1):
'--public-virtual-ip', '192.168.24.2', '--public-virtual-ip', '192.168.24.2',
'--control-virtual-ip', '192.168.24.3', '-e', '--control-virtual-ip', '192.168.24.3', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'tls-endpoints-public-ip.yaml', '-e', 'ssl/tls-endpoints-public-ip.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e', 'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
@@ -265,7 +265,7 @@ class TestUndercloudUpgrade(TestPluginV1):
'--public-virtual-ip', '192.168.24.2', '--public-virtual-ip', '192.168.24.2',
'--control-virtual-ip', '192.168.24.3', '-e', '--control-virtual-ip', '192.168.24.3', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'tls-endpoints-public-ip.yaml', '-e', 'ssl/tls-endpoints-public-ip.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e', 'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
@@ -317,7 +317,7 @@ class TestUndercloudUpgrade(TestPluginV1):
'--public-virtual-ip', '192.168.24.2', '--public-virtual-ip', '192.168.24.2',
'--control-virtual-ip', '192.168.24.3', '-e', '--control-virtual-ip', '192.168.24.3', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'tls-endpoints-public-ip.yaml', '-e', 'ssl/tls-endpoints-public-ip.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e', 'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'

4
tripleoclient/tests/v1/undercloud/test_undercloud_config.py
View File

@@ -108,7 +108,7 @@ class TestTLSSettings(base.TestCase):
def test_public_host_with_ip_should_give_ip_endpoint_environment(self): def test_public_host_with_ip_should_give_ip_endpoint_environment(self):
expected_env_file = os.path.join( expected_env_file = os.path.join(
undercloud_config.THT_HOME, undercloud_config.THT_HOME,
"environments/tls-endpoints-public-ip.yaml") "environments/ssl/tls-endpoints-public-ip.yaml")
resulting_env_file1 = undercloud_config._get_tls_endpoint_environment( resulting_env_file1 = undercloud_config._get_tls_endpoint_environment(
'127.0.0.1', undercloud_config.THT_HOME) '127.0.0.1', undercloud_config.THT_HOME)
@@ -123,7 +123,7 @@ class TestTLSSettings(base.TestCase):
def test_public_host_with_fqdn_should_give_dns_endpoint_environment(self): def test_public_host_with_fqdn_should_give_dns_endpoint_environment(self):
expected_env_file = os.path.join( expected_env_file = os.path.join(
undercloud_config.THT_HOME, undercloud_config.THT_HOME,
"environments/tls-endpoints-public-dns.yaml") "environments/ssl/tls-endpoints-public-dns.yaml")
resulting_env_file1 = undercloud_config._get_tls_endpoint_environment( resulting_env_file1 = undercloud_config._get_tls_endpoint_environment(
'controller-1', undercloud_config.THT_HOME) 'controller-1', undercloud_config.THT_HOME)

4
tripleoclient/v1/undercloud_config.py
View File

@@ -831,10 +831,10 @@ def _get_tls_endpoint_environment(public_host, tht_templates):
try: try:
netaddr.IPAddress(public_host) netaddr.IPAddress(public_host)
return os.path.join(tht_templates, return os.path.join(tht_templates,
"environments/tls-endpoints-public-ip.yaml") "environments/ssl/tls-endpoints-public-ip.yaml")
except netaddr.core.AddrFormatError: except netaddr.core.AddrFormatError:
return os.path.join(tht_templates, return os.path.join(tht_templates,
"environments/tls-endpoints-public-dns.yaml") "environments/ssl/tls-endpoints-public-dns.yaml")
def _get_public_tls_parameters(service_certificate_path): def _get_public_tls_parameters(service_certificate_path):