openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow swift proxy server to use independent hostnames"

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

3
ansible/group_vars/all.yml
View File

@ -380,7 +380,10 @@ storm_worker_port_range:
start: 6700 start: 6700
end: 6703 end: 6703
swift_internal_fqdn: "{{ kolla_internal_fqdn }}"
swift_external_fqdn: "{{ kolla_external_fqdn }}"
swift_proxy_server_port: "8080" swift_proxy_server_port: "8080"
swift_proxy_server_listen_port: "{{ swift_proxy_server_port }}"
swift_object_server_port: "6000" swift_object_server_port: "6000"
swift_account_server_port: "6001" swift_account_server_port: "6001"
swift_container_server_port: "6002" swift_container_server_port: "6002"

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

@ -42,7 +42,7 @@ backup_share = {{ cinder_backup_share }}
backup_file_size = 327680000 backup_file_size = 327680000
{% elif enable_swift | bool and cinder_backup_driver == "swift" %} {% elif enable_swift | bool and cinder_backup_driver == "swift" %}
backup_driver = cinder.backup.drivers.swift.SwiftBackupDriver backup_driver = cinder.backup.drivers.swift.SwiftBackupDriver
backup_swift_url = http://{{ kolla_internal_vip_address }}:{{ swift_proxy_server_port }}/v1/AUTH_ backup_swift_url = {{ internal_protocol }}://{{ swift_internal_fqdn }}:{{ swift_proxy_server_port }}/v1/AUTH_
backup_swift_auth = per_user backup_swift_auth = per_user
backup_swift_auth_version = 1 backup_swift_auth_version = 1
backup_swift_user = backup_swift_user =

10
ansible/roles/swift/defaults/main.yml
View File

@ -10,12 +10,12 @@ swift_services:
enabled: "{{ enable_swift }}" enabled: "{{ enable_swift }}"
mode: "http" mode: "http"
external: false external: false
port: "{{ swift_proxy_server_port }}" port: "{{ swift_proxy_server_listen_port }}"
swift_api_external: swift_api_external:
enabled: "{{ enable_swift }}" enabled: "{{ enable_swift }}"
mode: "http" mode: "http"
external: true external: true
port: "{{ swift_proxy_server_port }}" port: "{{ swift_proxy_server_listen_port }}"
#################### ####################
# Docker # Docker
@ -52,9 +52,9 @@ swift_log_level: "{{ 'INFO' if openstack_logging_debug == 'False' else 'DEBUG'}}
#################### ####################
# OpenStack # OpenStack
#################### ####################
swift_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_proxy_server_port }}/v1" swift_admin_endpoint: "{{ admin_protocol }}://{{ swift_internal_fqdn }}:{{ swift_proxy_server_port }}/v1"
swift_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_proxy_server_port }}/v1/AUTH_%(tenant_id)s" swift_internal_endpoint: "{{ internal_protocol }}://{{ swift_internal_fqdn }}:{{ swift_proxy_server_port }}/v1/AUTH_%(tenant_id)s"
swift_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ swift_proxy_server_port }}/v1/AUTH_%(tenant_id)s" swift_public_endpoint: "{{ public_protocol }}://{{ swift_external_fqdn }}:{{ swift_proxy_server_port }}/v1/AUTH_%(tenant_id)s"
swift_logging_debug: "{{ openstack_logging_debug }}" swift_logging_debug: "{{ openstack_logging_debug }}"

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

@ -55,7 +55,7 @@
- name: Checking free port for Swift Proxy Server - name: Checking free port for Swift Proxy Server
wait_for: wait_for:
host: "{{ api_interface_address }}" host: "{{ api_interface_address }}"
port: "{{ swift_proxy_server_port }}" port: "{{ swift_proxy_server_listen_port }}"
connect_timeout: 1 connect_timeout: 1
timeout: 1 timeout: 1
state: stopped state: stopped

2
ansible/roles/swift/templates/proxy-server.conf.j2
View File

@ -1,6 +1,6 @@
[DEFAULT] [DEFAULT]
bind_ip = {{ api_interface_address }} bind_ip = {{ api_interface_address }}
bind_port = {{ swift_proxy_server_port }} bind_port = {{ swift_proxy_server_listen_port }}
log_udp_host = {{ syslog_server }} log_udp_host = {{ syslog_server }}
log_udp_port = {{ syslog_udp_port }} log_udp_port = {{ syslog_udp_port }}