From d33931ca1080918598d85bad56f13d02e9962ad4 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Wed, 6 Jan 2016 18:59:32 +0800 Subject: [PATCH] Do not start and pull rsyncd on swift-proxy-server TrivalFix Change-Id: Ide5bd0103048e9ed096e8c77d2214855c2d65153 --- ansible/roles/swift/tasks/pull.yml | 3 +-- ansible/roles/swift/tasks/start.yml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/swift/tasks/pull.yml b/ansible/roles/swift/tasks/pull.yml index f054bb20e9..a0ca0c694a 100644 --- a/ansible/roles/swift/tasks/pull.yml +++ b/ansible/roles/swift/tasks/pull.yml @@ -6,8 +6,7 @@ image: "{{ swift_rsyncd_image_full }}" when: inventory_hostname in groups['swift-account-server'] or inventory_hostname in groups['swift-container-server'] or - inventory_hostname in groups['swift-object-server'] or - inventory_hostname in groups['swift-proxy-server'] + inventory_hostname in groups['swift-object-server'] - name: Pulling swift-account-auditor image kolla_docker: diff --git a/ansible/roles/swift/tasks/start.yml b/ansible/roles/swift/tasks/start.yml index 100d56c5e5..980c00b0ac 100644 --- a/ansible/roles/swift/tasks/start.yml +++ b/ansible/roles/swift/tasks/start.yml @@ -11,6 +11,7 @@ - "swift_sdb1:/srv/node/sdb1" - "swift_sdb2:/srv/node/sdb2" - "swift_sdb3:/srv/node/sdb3" + when: inventory_hostname not in groups['swift-proxy-server'] - name: Starting swift-proxy-server container kolla_docker: