From b8b4ebbb8772fe3bec91031a7392a7e935f6533e Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Tue, 24 Jan 2017 20:47:22 +0200 Subject: [PATCH] Use new parameters for the undercloud public/admin hostnames These parameters deprecated the undercloud_(public/admin)_vip parameters and are eventually used by the keystone endpoints and the certificate generation. they were introduced in I53151d4f555d5d161a3e53ce5f022e3bf3b2ffbd . Change-Id: I985d50135aa3b8fd73c2680044a44337454fc63a --- roles/undercloud-deploy/README.md | 4 ++++ .../templates/undercloud.conf.j2 | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/roles/undercloud-deploy/README.md b/roles/undercloud-deploy/README.md index 2c7feb059..0a0237653 100644 --- a/roles/undercloud-deploy/README.md +++ b/roles/undercloud-deploy/README.md @@ -33,6 +33,10 @@ properly with the option --old-deploy-image user sessions to provide greater flexixiblity to our users. ** additional documentation ** is at http://docs.openstack.org/developer/tripleo-quickstart/accessing-libvirt.html - `undercloud_conf_extra`: "" -- extra options to be added to ~/undercloud.conf +- undercloud_undercloud_public_host: Sets up the 'undercloud_public_host' + parameter from undercloud.conf. +- undercloud_undercloud_admin_host: Sets up the 'undercloud_admin_host' from + undercloud.conf. Role Network Variables ---------------------- diff --git a/roles/undercloud-deploy/templates/undercloud.conf.j2 b/roles/undercloud-deploy/templates/undercloud.conf.j2 index c3f60439a..977782c51 100644 --- a/roles/undercloud-deploy/templates/undercloud.conf.j2 +++ b/roles/undercloud-deploy/templates/undercloud.conf.j2 @@ -44,6 +44,7 @@ local_ip = {{undercloud_local_ip|default( network_gateway = {{undercloud_network_gateway|default( undercloud_network_cidr|nthhost(1))}} +{% if release in ['mitaka', 'newton'] %} # Virtual IP address to use for the public endpoints of Undercloud # services. Only used if undercloud_service_certficate is set. # (string value) @@ -55,6 +56,21 @@ undercloud_public_vip = {{undercloud_undercloud_public_vip|default( # (string value) undercloud_admin_vip = {{undercloud_undercloud_admin_vip|default( undercloud_network_cidr|nthhost(3))}} +{% else %} +# Virtual IP or DNS address to use for the public endpoints of +# Undercloud services. Only used with SSL. (string value) +# Deprecated group/name - [DEFAULT]/undercloud_public_vip +#undercloud_public_host = 192.168.24.2 +undercloud_public_host = {{undercloud_undercloud_public_host|default( + undercloud_network_cidr|nthhost(2))}} + +# Virtual IP or DNS address to use for the admin endpoints of +# Undercloud services. Only used with SSL. (string value) +# Deprecated group/name - [DEFAULT]/undercloud_admin_vip +#undercloud_admin_host = 192.168.24.3 +undercloud_admin_host = {{undercloud_undercloud_admin_host|default( + undercloud_network_cidr|nthhost(3))}} +{% endif %} # Nameserver for the Undercloud node. # (string value)