openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow octavia services to use independent hostnames"

Browse Source
This commit is contained in:
Zuul 2019-03-07 12:44:53 +00:00 committed by Gerrit Code Review
commit 20ccebbe4b
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/group_vars/all.yml
View File

@ -306,7 +306,10 @@ nova_serialproxy_fqdn: "{{ kolla_external_fqdn }}"
nova_serialproxy_port: "6083" nova_serialproxy_port: "6083"
nova_serialproxy_listen_port: "{{ nova_serialproxy_port }}" nova_serialproxy_listen_port: "{{ nova_serialproxy_port }}"
octavia_internal_fqdn: "{{ kolla_internal_fqdn }}"
octavia_external_fqdn: "{{ kolla_external_fqdn }}"
octavia_api_port: "9876" octavia_api_port: "9876"
octavia_api_listen_port: "{{ octavia_api_port }}"
octavia_health_manager_port: "5555" octavia_health_manager_port: "5555"
outward_rabbitmq_port: "5674" outward_rabbitmq_port: "5674"

2
ansible/roles/neutron/templates/neutron.conf.j2
View File

@ -133,7 +133,7 @@ drivers = ovs
{% if enable_octavia | bool %} {% if enable_octavia | bool %}
[octavia] [octavia]
base_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ octavia_api_port }} base_url = {{ internal_protocol }}://{{ octavia_internal_fqdn }}:{{ octavia_api_port }}
{% endif %} {% endif %}
{% if enable_designate | bool %} {% if enable_designate | bool %}

6
ansible/roles/octavia/defaults/main.yml
View File

@ -101,9 +101,9 @@ octavia_worker_dimensions: "{{ default_container_dimensions }}"
#################### ####################
# OpenStack # OpenStack
#################### ####################
octavia_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ octavia_api_port }}" octavia_admin_endpoint: "{{ admin_protocol }}://{{ octavia_internal_fqdn }}:{{ octavia_api_port }}"
octavia_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ octavia_api_port }}" octavia_internal_endpoint: "{{ internal_protocol }}://{{ octavia_internal_fqdn }}:{{ octavia_api_port }}"
octavia_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ octavia_api_port }}" octavia_public_endpoint: "{{ public_protocol }}://{{ octavia_external_fqdn }}:{{ octavia_api_port }}"
octavia_logging_debug: "{{ openstack_logging_debug }}" octavia_logging_debug: "{{ openstack_logging_debug }}"

2
ansible/roles/octavia/tasks/precheck.yml
View File

@ -9,7 +9,7 @@
- name: Checking free port for Octavia API - name: Checking free port for Octavia API
wait_for: wait_for:
host: "{{ api_interface_address }}" host: "{{ api_interface_address }}"
port: "{{ octavia_api_port }}" port: "{{ octavia_api_listen_port }}"
connect_timeout: 1 connect_timeout: 1
timeout: 1 timeout: 1
state: stopped state: stopped

2
ansible/roles/octavia/templates/octavia.conf.j2
View File

@ -7,7 +7,7 @@ transport_url = {{ rpc_transport_url }}
[api_settings] [api_settings]
bind_host = {{ api_interface_address }} bind_host = {{ api_interface_address }}
bind_port = {{ octavia_api_port }} bind_port = {{ octavia_api_listen_port }}
[certificates] [certificates]
ca_private_key_passphrase = {{ octavia_ca_password }} ca_private_key_passphrase = {{ octavia_ca_password }}