openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow barbican services to use independent hostnames"

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

3
ansible/group_vars/all.yml
View File

@ -186,7 +186,10 @@ neutron_ipam_driver: "internal"
# The list should be in alphabetical order # The list should be in alphabetical order
aodh_api_port: "8042" aodh_api_port: "8042"
barbican_internal_fqdn: "{{ kolla_internal_fqdn }}"
barbican_external_fqdn: "{{ kolla_external_fqdn }}"
barbican_api_port: "9311" barbican_api_port: "9311"
barbican_api_listen_port: "{{ barbican_api_port }}"
blazar_api_port: "1234" blazar_api_port: "1234"

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

@ -20,11 +20,13 @@ barbican_services:
mode: "http" mode: "http"
external: false external: false
port: "{{ barbican_api_port }}" port: "{{ barbican_api_port }}"
listen_port: "{{ barbican_api_listen_port }}"
barbican_api_external: barbican_api_external:
enabled: "{{ enable_barbican }}" enabled: "{{ enable_barbican }}"
mode: "http" mode: "http"
external: true external: true
port: "{{ barbican_api_port }}" port: "{{ barbican_api_port }}"
listen_port: "{{ barbican_api_listen_port }}"
barbican-keystone-listener: barbican-keystone-listener:
container_name: barbican_keystone_listener container_name: barbican_keystone_listener
group: barbican-keystone-listener group: barbican-keystone-listener
@ -82,9 +84,9 @@ barbican_worker_dimensions: "{{ default_container_dimensions }}"
#################### ####################
# OpenStack # OpenStack
#################### ####################
barbican_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ barbican_api_port }}" barbican_admin_endpoint: "{{ admin_protocol }}://{{ barbican_internal_fqdn }}:{{ barbican_api_port }}"
barbican_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ barbican_api_port }}" barbican_internal_endpoint: "{{ internal_protocol }}://{{ barbican_internal_fqdn }}:{{ barbican_api_port }}"
barbican_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ barbican_api_port }}" barbican_public_endpoint: "{{ public_protocol }}://{{ barbican_external_fqdn }}:{{ barbican_api_port }}"
barbican_logging_debug: "{{ openstack_logging_debug }}" barbican_logging_debug: "{{ openstack_logging_debug }}"

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

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

2
ansible/roles/barbican/templates/barbican-api.ini.j2
View File

@ -1,5 +1,5 @@
[uwsgi] [uwsgi]
socket = {{ api_interface_address }}:{{ barbican_api_port }} socket = {{ api_interface_address }}:{{ barbican_api_listen_port }}
protocol = http protocol = http
processes = {{ openstack_service_workers }} processes = {{ openstack_service_workers }}
lazy = true lazy = true

4
ansible/roles/barbican/templates/barbican.conf.j2
View File

@ -2,9 +2,9 @@
debug = {{ barbican_logging_debug }} debug = {{ barbican_logging_debug }}
log_dir = /var/log/kolla/barbican log_dir = /var/log/kolla/barbican
bind_port = {{ barbican_api_port }} bind_port = {{ barbican_api_listen_port }}
bind_host = {{ api_interface_address }} bind_host = {{ api_interface_address }}
host_href = {{ public_protocol }}://{{ kolla_external_fqdn }}:{{ barbican_api_port }} host_href = {{ public_protocol }}://{{ barbican_external_fqdn }}:{{ barbican_api_port }}
backlog = 4096 backlog = 4096
max_allowed_secret_in_bytes = 10000 max_allowed_secret_in_bytes = 10000
max_allowed_request_size_in_bytes = 1000000 max_allowed_request_size_in_bytes = 1000000