openstack/kolla-ansible
Code Issues Proposed changes

Merge "Swift data transfer should not be using the API Network"

Browse Source
This commit is contained in:
Jenkins 2016-12-09 19:45:01 +00:00 committed by Gerrit Code Review
commit 83fc59fbbc
4 changed files with 6 additions and 6 deletions
ansible/roles
prechecks/tasks
port_checks.yml
swift/templates
account.conf.j2container.conf.j2object.conf.j2

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

@ -762,7 +762,7 @@
- name: Checking free port for Swift Object Server
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 }}"
connect_timeout: 1
state: stopped
@ -772,7 +772,7 @@
- name: Checking free port for Swift Account Server
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 }}"
connect_timeout: 1
state: stopped
@ -782,7 +782,7 @@
- name: Checking free port for Swift Container Server
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 }}"
connect_timeout: 1
state: stopped

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

@ -1,5 +1,5 @@
[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 }}
devices = {{ swift_devices_mount_point }}
mount_check = false

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

@ -1,5 +1,5 @@
[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 }}
devices = {{ swift_devices_mount_point }}
mount_check = false

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

@ -1,5 +1,5 @@
[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 }}
devices = {{ swift_devices_mount_point }}
mount_check = false