d3cfb2052a
Due to poor planning on our variable names we have a situation where we have "internal_address" which must be a VIP, but "external_address" which should be a DNS name. Now with two vips "external_vip_address" is a new variable. This corrects that issue by deprecating kolla_internal_address and replacing it with 4 nicely named variables. kolla_internal_vip_address kolla_internal_fqdn kolla_external_vip_address kolla_external_fqdn The default behaviour will remain the same, and the way the variable inheritance is setup the kolla_internal_address variable can still be set in globals.yml and propogate out to these 4 new variables like it normally would, but all reference to kolla_internal_address has been completely removed. Change-Id: I4556dcdbf4d91a8d2751981ef9c64bad44a719e5 Partially-Implements: blueprint ssl-kolla
39 lines
1.5 KiB
YAML
39 lines
1.5 KiB
YAML
---
|
|
project_name: "heat"
|
|
|
|
####################
|
|
# Database
|
|
####################
|
|
heat_database_name: "heat"
|
|
heat_database_user: "heat"
|
|
heat_database_address: "{{ kolla_internal_fqdn }}"
|
|
|
|
|
|
####################
|
|
# Docker
|
|
####################
|
|
heat_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-heat-api"
|
|
heat_api_tag: "{{ openstack_release }}"
|
|
heat_api_image_full: "{{ heat_api_image }}:{{ heat_api_tag }}"
|
|
|
|
heat_api_cfn_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-heat-api-cfn"
|
|
heat_api_cfn_tag: "{{ openstack_release }}"
|
|
heat_api_cfn_image_full: "{{ heat_api_cfn_image }}:{{ heat_api_cfn_tag }}"
|
|
|
|
heat_engine_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-heat-engine"
|
|
heat_engine_tag: "{{ openstack_release }}"
|
|
heat_engine_image_full: "{{ heat_engine_image }}:{{ heat_engine_tag }}"
|
|
|
|
####################
|
|
# OpenStack
|
|
####################
|
|
heat_public_address: "{{ kolla_external_fqdn }}"
|
|
heat_admin_address: "{{ kolla_internal_fqdn }}"
|
|
heat_internal_address: "{{ kolla_internal_fqdn }}"
|
|
|
|
heat_logging_debug: "{{ openstack_logging_debug }}"
|
|
|
|
heat_keystone_user: "heat"
|
|
|
|
openstack_heat_auth: "{'auth_url':'{{ openstack_auth_v2.auth_url }}','username':'{{ openstack_auth_v2.username }}','password':'{{ openstack_auth_v2.password }}','project_name':'{{ openstack_auth_v2.project_name }}'}"
|