Merge "Fix ansible-lint warnings related to jinja spacing"
This commit is contained in:
commit
59ab6bf049
@ -269,7 +269,7 @@ bifrost_network_address_family: "{{ network_address_family }}"
|
||||
dns_address_family: "{{ network_address_family }}"
|
||||
dpdk_tunnel_address_family: "{{ network_address_family }}"
|
||||
ironic_http_address_family: "{{ api_address_family }}"
|
||||
ironic_tftp_address_family: "{{ api_address_family }}"
|
||||
ironic_tftp_address_family: "{{ api_address_family }}"
|
||||
|
||||
migration_interface_address: "{{ 'migration' | kolla_address }}"
|
||||
tunnel_interface_address: "{{ 'tunnel' | kolla_address }}"
|
||||
|
@ -137,7 +137,7 @@ magnum_conductor_container_proxy: "{{ container_proxy }}"
|
||||
# OpenStack
|
||||
####################
|
||||
magnum_internal_endpoint: "{{ magnum_internal_fqdn | kolla_url(internal_protocol, magnum_api_port, '/v1') }}"
|
||||
magnum_public_endpoint: "{{ magnum_external_fqdn | kolla_url(public_protocol, magnum_api_public_port, '/v1') }}"
|
||||
magnum_public_endpoint: "{{ magnum_external_fqdn | kolla_url(public_protocol, magnum_api_public_port, '/v1') }}"
|
||||
|
||||
magnum_logging_debug: "{{ openstack_logging_debug }}"
|
||||
|
||||
|
@ -199,7 +199,7 @@ nova_api_bootstrap_extra_volumes: "{{ nova_extra_volumes }}"
|
||||
# OpenStack
|
||||
####################
|
||||
nova_internal_base_endpoint: "{{ nova_internal_fqdn | kolla_url(internal_protocol, nova_api_port) }}"
|
||||
nova_public_base_endpoint: "{{ nova_external_fqdn | kolla_url(public_protocol, nova_api_public_port) }}"
|
||||
nova_public_base_endpoint: "{{ nova_external_fqdn | kolla_url(public_protocol, nova_api_public_port) }}"
|
||||
|
||||
nova_legacy_internal_endpoint: "{{ nova_internal_base_endpoint }}/v2/%(tenant_id)s"
|
||||
nova_legacy_public_endpoint: "{{ nova_public_base_endpoint }}/v2/%(tenant_id)s"
|
||||
|
Loading…
Reference in New Issue
Block a user