openstack/kolla-ansible
Code Issues Proposed changes

Swift data transfer should not be using the API Network

Browse Source 
The account, container, and object templates were incorrectly
using the api_interface as their bind_ip configuration setting.

Updated these templates to instead use the storage_interface.

Change-Id: I683102096cd6aa3c77a7900f5a1a248cdcddba42
Note: Rings must be generated accordingly.
This commit is contained in:
James McCarthy 2016-12-06 17:52:04 +00:00
parent 2ec6e07d6d
commit 66e17f6a4b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/prechecks/tasks/port_checks.yml
View File

@ -762,7 +762,7 @@
- name: Checking free port for Swift Object Server - name: Checking free port for Swift Object Server
wait_for: wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" host: "{{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}"
port: "{{ swift_object_server_port }}" port: "{{ swift_object_server_port }}"
connect_timeout: 1 connect_timeout: 1
state: stopped state: stopped
@ -772,7 +772,7 @@
- name: Checking free port for Swift Account Server - name: Checking free port for Swift Account Server
wait_for: wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" host: "{{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}"
port: "{{ swift_account_server_port }}" port: "{{ swift_account_server_port }}"
connect_timeout: 1 connect_timeout: 1
state: stopped state: stopped
@ -782,7 +782,7 @@
- name: Checking free port for Swift Container Server - name: Checking free port for Swift Container Server
wait_for: wait_for:
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" host: "{{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}"
port: "{{ swift_container_server_port }}" port: "{{ swift_container_server_port }}"
connect_timeout: 1 connect_timeout: 1
state: stopped state: stopped

2
ansible/roles/swift/templates/account.conf.j2
View File

@ -1,5 +1,5 @@
[DEFAULT] [DEFAULT]
bind_ip = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} bind_ip = {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}
bind_port = {{ swift_account_server_port }} bind_port = {{ swift_account_server_port }}
devices = {{ swift_devices_mount_point }} devices = {{ swift_devices_mount_point }}
mount_check = false mount_check = false

2
ansible/roles/swift/templates/container.conf.j2
View File

@ -1,5 +1,5 @@
[DEFAULT] [DEFAULT]
bind_ip = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} bind_ip = {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}
bind_port = {{ swift_container_server_port }} bind_port = {{ swift_container_server_port }}
devices = {{ swift_devices_mount_point }} devices = {{ swift_devices_mount_point }}
mount_check = false mount_check = false

2
ansible/roles/swift/templates/object.conf.j2
View File

@ -1,5 +1,5 @@
[DEFAULT] [DEFAULT]
bind_ip = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} bind_ip = {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}
bind_port = {{ swift_object_server_port }} bind_port = {{ swift_object_server_port }}
devices = {{ swift_devices_mount_point }} devices = {{ swift_devices_mount_point }}
mount_check = false mount_check = false