diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-01-06 18:59:32 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-01-09 19:28:22 +0800 |
| commit | d33931ca1080918598d85bad56f13d02e9962ad4 (patch) | |
| tree | 9a4741e98df976c4a3915265e9127b7882ab394c | |
| parent | 4bdf8bfa84ca5bdaa65713d61eaa8c9527aac4d6 (diff) | |
| download | kolla-d33931ca1080918598d85bad56f13d02e9962ad4.tar.gz kolla-d33931ca1080918598d85bad56f13d02e9962ad4.zip | |
Do not start and pull rsyncd on swift-proxy-server
TrivalFix
Change-Id: Ide5bd0103048e9ed096e8c77d2214855c2d65153
| -rw-r--r-- | ansible/roles/swift/tasks/pull.yml | 3 | ||||
| -rw-r--r-- | 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 f054bb20e..a0ca0c694 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 100d56c5e..980c00b0a 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: |