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
35 lines
1.3 KiB
YAML
35 lines
1.3 KiB
YAML
---
|
|
project_name: "magnum"
|
|
|
|
####################
|
|
# Database
|
|
####################
|
|
magnum_database_name: "magnum"
|
|
magnum_database_user: "magnum"
|
|
magnum_database_address: "{{ kolla_internal_fqdn }}"
|
|
|
|
|
|
####################
|
|
# Docker
|
|
####################
|
|
magnum_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-magnum-api"
|
|
magnum_api_tag: "{{ openstack_release }}"
|
|
magnum_api_image_full: "{{ magnum_api_image }}:{{ magnum_api_tag }}"
|
|
magnum_conductor_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-magnum-conductor"
|
|
magnum_conductor_tag: "{{ openstack_release }}"
|
|
magnum_conductor_image_full: "{{ magnum_conductor_image }}:{{ magnum_conductor_tag }}"
|
|
|
|
|
|
####################
|
|
# OpenStack
|
|
####################
|
|
magnum_public_address: "{{ kolla_external_fqdn }}"
|
|
magnum_admin_address: "{{ kolla_internal_fqdn }}"
|
|
magnum_internal_address: "{{ kolla_internal_fqdn }}"
|
|
|
|
magnum_logging_debug: "{{ openstack_logging_debug }}"
|
|
|
|
magnum_keystone_user: "magnum"
|
|
|
|
openstack_magnum_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 }}'}"
|