openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow senlin services to use independent hostnames"

Browse Source
This commit is contained in:
Zuul 2019-03-07 12:44:55 +00:00 committed by Gerrit Code Review
commit 8ccd55339a
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/group_vars/all.yml
View File

@ -360,7 +360,10 @@ sahara_api_port: "8386"
searchlight_api_port: "9393" searchlight_api_port: "9393"
senlin_internal_fqdn: "{{ kolla_internal_fqdn }}"
senlin_external_fqdn: "{{ kolla_external_fqdn }}"
senlin_api_port: "8778" senlin_api_port: "8778"
senlin_api_listen_port: "{{ senlin_api_port }}"
skydive_analyzer_port: "8085" skydive_analyzer_port: "8085"
skydive_agents_port: "8090" skydive_agents_port: "8090"

8
ansible/roles/senlin/defaults/main.yml
View File

@ -19,11 +19,13 @@ senlin_services:
mode: "http" mode: "http"
external: false external: false
port: "{{ senlin_api_port }}" port: "{{ senlin_api_port }}"
listen_port: "{{ senlin_api_listen_port }}"
senlin_api_external: senlin_api_external:
enabled: "{{ enable_senlin }}" enabled: "{{ enable_senlin }}"
mode: "http" mode: "http"
external: true external: true
port: "{{ senlin_api_port }}" port: "{{ senlin_api_port }}"
listen_port: "{{ senlin_api_listen_port }}"
senlin-engine: senlin-engine:
container_name: senlin_engine container_name: senlin_engine
group: senlin-engine group: senlin-engine
@ -65,9 +67,9 @@ senlin_engine_dimensions: "{{ default_container_dimensions }}"
#################### ####################
# OpenStack # OpenStack
#################### ####################
senlin_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ senlin_api_port }}" senlin_admin_endpoint: "{{ admin_protocol }}://{{ senlin_internal_fqdn }}:{{ senlin_api_port }}"
senlin_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ senlin_api_port }}" senlin_internal_endpoint: "{{ internal_protocol }}://{{ senlin_internal_fqdn }}:{{ senlin_api_port }}"
senlin_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ senlin_api_port }}" senlin_public_endpoint: "{{ public_protocol }}://{{ senlin_external_fqdn }}:{{ senlin_api_port }}"
senlin_logging_debug: "{{ openstack_logging_debug }}" senlin_logging_debug: "{{ openstack_logging_debug }}"

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

@ -8,7 +8,7 @@
- name: Checking free port for Senlin API - name: Checking free port for Senlin API
wait_for: wait_for:
host: "{{ api_interface_address }}" host: "{{ api_interface_address }}"
port: "{{ senlin_api_port }}" port: "{{ senlin_api_listen_port }}"
connect_timeout: 1 connect_timeout: 1
timeout: 1 timeout: 1
state: stopped state: stopped

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

@ -12,7 +12,7 @@ transport_url = {{ rpc_transport_url }}
{% if service_name == 'senlin-api' %} {% if service_name == 'senlin-api' %}
[senlin_api] [senlin_api]
bind_host = {{ api_interface_address }} bind_host = {{ api_interface_address }}
bind_port = {{ senlin_api_port }} bind_port = {{ senlin_api_listen_port }}
workers = {{ openstack_service_workers }} workers = {{ openstack_service_workers }}
{% endif %} {% endif %}