From 66e17f6a4baf463913749d8157d294e2ae73a83a Mon Sep 17 00:00:00 2001 From: James McCarthy Date: Tue, 6 Dec 2016 17:52:04 +0000 Subject: [PATCH] Swift data transfer should not be using the API Network 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. --- ansible/roles/prechecks/tasks/port_checks.yml | 6 +++--- ansible/roles/swift/templates/account.conf.j2 | 2 +- ansible/roles/swift/templates/container.conf.j2 | 2 +- ansible/roles/swift/templates/object.conf.j2 | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible/roles/prechecks/tasks/port_checks.yml b/ansible/roles/prechecks/tasks/port_checks.yml index dc7dfa1159..ed4fc95d14 100644 --- a/ansible/roles/prechecks/tasks/port_checks.yml +++ b/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 diff --git a/ansible/roles/swift/templates/account.conf.j2 b/ansible/roles/swift/templates/account.conf.j2 index df8437b946..37bae3e5d0 100644 --- a/ansible/roles/swift/templates/account.conf.j2 +++ b/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 diff --git a/ansible/roles/swift/templates/container.conf.j2 b/ansible/roles/swift/templates/container.conf.j2 index 2daad6bc15..563cdcc2f6 100644 --- a/ansible/roles/swift/templates/container.conf.j2 +++ b/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 diff --git a/ansible/roles/swift/templates/object.conf.j2 b/ansible/roles/swift/templates/object.conf.j2 index bd8b25fa92..2fdad13509 100644 --- a/ansible/roles/swift/templates/object.conf.j2 +++ b/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