openstack
/
python-tripleoclient
Code Issues Proposed changes

undercloud_config: setup VIPs, haproxy, etc 

This patch selectively enables setting up the required VIPs and
layers in the haproxy and keepalived services (on baremetal for now).

We only want to enable HAproxy in the undercloud when using TLS.

Co-Authored-By: Ian Main <imain@redhat.com>

Depends-On: Icca382db28e4ea57f3cbf24e9e794b428b824db5

Change-Id: I94ce24f349c64b77d10112888a48f61e33a0ee45
This commit is contained in:
Dan Prince 2017-12-09 17:54:00 -05:00 committed by Emilien Macchi
parent c915236efb
commit 56e009bd86
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tripleoclient/v1/undercloud_config.py
View File

@ -568,6 +568,40 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False):
'environments/services-docker/undercloud-haproxy.yaml',
'-e', 'environments/services-docker/undercloud-keepalived.yaml']
if (CONF.get('generate_service_certificate') or
CONF.get('undercloud_service_certificate')):
try:
public_host = CONF.get('undercloud_public_host')
netaddr.IPAddress(public_host)
deploy_args += ['--public-virtual-ip', public_host]
admin_host = CONF.get('undercloud_admin_host')
netaddr.IPAddress(admin_host)
deploy_args += ['--control-virtual-ip', admin_host]
endpoint_environment = os.path.join(
tht_templates,
"environments/tls-endpoints-public-ip.yaml")
except netaddr.core.AddrFormatError:
endpoint_environment = os.path.join(
tht_templates,
"environments/tls-endpoints-public-dns.yaml")
deploy_args += [
'-e', os.path.join(
tht_templates,
'environments/public-tls-undercloud.yaml'),
'-e', endpoint_environment,
'-e', os.path.join(
tht_templates,
'environments/use-dns-for-vips.yaml'),
'-e', os.path.join(
tht_templates,
'environments/services-docker/undercloud-haproxy.yaml'),
'-e', os.path.join(
tht_templates,
'environments/services-docker/undercloud-keepalived.yaml')]
deploy_args += [
"-e", os.path.join(tht_templates, "environments/docker.yaml"),
"-e",