Merge "Add variables for API VIP address and FQDN"

This commit is contained in:
Zuul 2021-01-21 20:14:37 +00:00 committed by Gerrit Code Review
commit ff7c1741d8
8 changed files with 126 additions and 57 deletions

View File

@ -550,6 +550,27 @@ kolla_ansible_default_custom_passwords:
# passwords file.
kolla_ansible_custom_passwords: "{{ kolla_ansible_default_custom_passwords }}"
###############################################################################
# OpenStack API addresses.
# Virtual IP address of OpenStack internal API. Default is the vip_address
# attribute of the internal network.
kolla_internal_vip_address: "{{ internal_net_name | net_vip_address }}"
# Fully Qualified Domain Name (FQDN) of OpenStack internal API. Default is the
# fqdn attribute of the internal network if set, otherwise
# kolla_internal_vip_address.
kolla_internal_fqdn: "{{ internal_net_name | net_fqdn or kolla_internal_vip_address }}"
# Virtual IP address of OpenStack external API. Default is the vip_address
# attribute of the external network.
kolla_external_vip_address: "{{ public_net_name | net_vip_address }}"
# Fully Qualified Domain Name (FQDN) of OpenStack external API. Default is the
# fqdn attribute of the external network if set, otherwise
# kolla_external_vip_address.
kolla_external_fqdn: "{{ public_net_name | net_fqdn or kolla_external_vip_address }}"
###############################################################################
# TLS certificate bundle management

View File

@ -27,12 +27,6 @@
tags:
- kolla-ansible
gather_facts: false
vars:
# We need to reference configuration for the network node.
# We pick the first host from the group for this. It is possible that at
# this point these groups have no hosts in, and we should handle that case
# gracefully.
network_host: "{{ groups['network'][0] }}"
pre_tasks:
# Configuration of extra user-provided Kolla globals.
- block:
@ -52,23 +46,6 @@
- config
# Configuration and validation of network host networking.
- block:
- name: Set facts containing the VIP addresses and FQDNs
set_fact:
kolla_internal_vip_address: "{{ internal_net_name | net_vip_address }}"
kolla_internal_fqdn: "{{ internal_net_name | net_fqdn or internal_net_name | net_vip_address }}"
kolla_external_vip_address: "{{ public_net_name | net_vip_address }}"
kolla_external_fqdn: "{{ public_net_name | net_fqdn or public_net_name | net_vip_address }}"
when: kolla_enable_haproxy | bool
- name: Set facts containing the VIP addresses and FQDNs
set_fact:
kolla_internal_vip_address: "{{ internal_net_name | net_ip(network_host) }}"
kolla_internal_fqdn: "{{ internal_net_name | net_ip(network_host) }}"
kolla_external_vip_address: "{{ public_net_name | net_ip(network_host) }}"
kolla_external_fqdn: "{{ public_net_name | net_ip(network_host) }}"
when: not kolla_enable_haproxy | bool
- name: Validate Kolla Ansible API address configuration
fail:
msg: >
@ -76,6 +53,7 @@
({{ item.description }}) is invalid. Value:
"{{ hostvars[inventory_hostname][item.var_name] | default('<undefined>') }}".
when:
- groups['network'] | length > 0
- item.required | bool
- hostvars[inventory_hostname][item.var_name] is not defined or not hostvars[inventory_hostname][item.var_name]
with_items:
@ -91,7 +69,6 @@
- var_name: "kolla_external_fqdn"
description: "External API Fully Qualified Domain Name (FQDN)"
required: True
when: groups['network'] | length > 0
tags:
- config
- config-validation

View File

@ -59,16 +59,6 @@
tags:
- grafana
pre_tasks:
- name: Set fact for the VIP address
set_fact:
kolla_internal_vip_address: "{{ internal_net_name | net_vip_address }}"
when: kolla_enable_haproxy | bool
- name: Set fact for the VIP address
set_fact:
kolla_internal_vip_address: "{{ internal_net_name | net_ip }}"
when: not kolla_enable_haproxy | bool
- name: Include Kolla passwords for Grafana local admin account credentials
include_vars: "{{ kayobe_config_path }}/kolla/passwords.yml"
roles:

View File

@ -8,7 +8,7 @@
- public-openrc
vars:
public_api_proto: "{% if kolla_enable_tls_external | bool %}https{% else %}http{% endif %}"
public_api_host: "{{ public_net_name | net_fqdn or public_net_name | net_vip_address }}"
public_api_host: "{{ kolla_external_fqdn }}"
public_api_keystone_port: 5000
roles:
- role: public-openrc

View File

@ -225,6 +225,32 @@ OpenStack services. This is not usually advisable in production.
---
kolla_openstack_logging_debug: true
API Addresses
-------------
.. note::
These variables should be used over the deprecated ``vip_address`` and
``fqdn`` `network attributes <configuration-network-global>`
The following variables affect the addresses used for the external and internal
API.
``kolla_internal_vip_address``
Virtual IP address of OpenStack internal API. Default is the
``vip_address`` attribute of the internal network.
``kolla_internal_fqdn``
Fully Qualified Domain Name (FQDN) of OpenStack internal API. Default is
the ``fqdn`` attribute of the internal network if set, otherwise
``kolla_internal_vip_address``.
``kolla_external_vip_address``
Virtual IP address of OpenStack external API. Default is the
``vip_address`` attribute of the external network.
``kolla_external_fqdn``
Fully Qualified Domain Name (FQDN) of OpenStack external API. Default is
the ``fqdn`` attribute of the external network if set, otherwise
``kolla_external_vip_address``.
TLS Encryption of APIs
----------------------

View File

@ -10,6 +10,8 @@ that define the network's attributes. For example, to configure the ``cidr``
attribute of a network named ``arpanet``, we would use a variable named
``arpanet_cidr``.
.. _configuration-network-global:
Global Network Configuration
============================
@ -42,8 +44,18 @@ supported:
``mtu``
Maximum Transmission Unit (MTU).
``vip_address``
.. note::
Use of the ``vip_address`` attribute is deprecated. Instead use
``kolla_internal_vip_address`` and ``kolla_external_vip_address``.
Virtual IP address (VIP) used by API services on this network.
``fqdn``
.. note::
Use of the ``fqdn`` attribute is deprecated. Instead use
``kolla_internal_fqdn`` and ``kolla_external_fqdn``.
Fully Qualified Domain Name (FQDN) used by API services on this network.
``routes``
List of static IP routes. Each item should be a dict containing the

View File

@ -345,6 +345,27 @@
# passwords file.
#kolla_ansible_custom_passwords:
###############################################################################
# OpenStack API addresses.
# Virtual IP address of OpenStack internal API. Default is the vip_address
# attribute of the internal network.
#kolla_internal_vip_address:
# Fully Qualified Domain Name (FQDN) of OpenStack internal API. Default is the
# fqdn attribute of the internal network if set, otherwise
# kolla_internal_vip_address.
#kolla_internal_fqdn:
# Virtual IP address of OpenStack external API. Default is the vip_address
# attribute of the external network.
#kolla_external_vip_address:
# Fully Qualified Domain Name (FQDN) of OpenStack external API. Default is the
# fqdn attribute of the external network if set, otherwise
# kolla_external_vip_address.
#kolla_external_fqdn:
###############################################################################
# TLS certificate bundle management

View File

@ -0,0 +1,22 @@
---
features:
- |
Adds the following new variables for the Kolla Ansible API VIP address and
FQDNs:
* ``kolla_internal_vip_address``
* ``kolla_internal_fqdn``
* ``kolla_external_vip_address``
* ``kolla_external_fqdn``
These variables should be used in preference to the ``vip_address`` and
``fqdn`` network attributes which are deprecated.
deprecations:
- |
The ``vip_address`` and ``fqdn`` network attributes are deprecated in
favour of the following variables:
* ``kolla_internal_vip_address``
* ``kolla_internal_fqdn``
* ``kolla_external_vip_address``
* ``kolla_external_fqdn``