diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-02 21:39:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-02 21:39:07 +0000 |
| commit | 262e880b86b38d87866c7a61b0aaae8cd6ff81eb (patch) | |
| tree | 42672632b5c6a1276925853015b9f1419a53ef7b | |
| parent | 572e80e6d081ae1d42998b5a4cb3fcaa9b6b2a48 (diff) | |
| parent | b209da1306c454366210e88f5a7a0e14bdd88fc4 (diff) | |
| download | kolla-262e880b86b38d87866c7a61b0aaae8cd6ff81eb.tar.gz kolla-262e880b86b38d87866c7a61b0aaae8cd6ff81eb.zip | |
Merge "Fix Swift for multinode P+ACO deployment"
| -rw-r--r-- | ansible/roles/swift/tasks/start.yml | 10 | ||||
| -rw-r--r-- | docker/swift/swift-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/swift/swift-proxy-server/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/swift/swift-proxy-server/extend_start.sh | 3 | ||||
| -rw-r--r-- | docker/swift/swift-rsyncd/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/swift/swift-rsyncd/extend_start.sh (renamed from docker/swift/swift-base/config-swift.sh) | 0 |
6 files changed, 12 insertions, 8 deletions
diff --git a/ansible/roles/swift/tasks/start.yml b/ansible/roles/swift/tasks/start.yml index c5bb8ba54..9fbc9c562 100644 --- a/ansible/roles/swift/tasks/start.yml +++ b/ansible/roles/swift/tasks/start.yml @@ -8,10 +8,16 @@ changed_when: "{{ swift_disk_lookup.stdout.find('localhost | SUCCESS => ') != -1 and (swift_disk_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}" failed_when: swift_disk_lookup.stdout.split()[2] != 'SUCCESS' + when: inventory_hostname in groups['swift-account-server'] or + inventory_hostname in groups['swift-container-server'] or + inventory_hostname in groups['swift-object-server'] - name: Reading data from variable set_fact: swift_disks: "{{ (swift_disk_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).disks|from_json }}" + when: inventory_hostname in groups['swift-account-server'] or + inventory_hostname in groups['swift-container-server'] or + inventory_hostname in groups['swift-object-server'] - name: Mounting Swift disks mount: @@ -21,6 +27,9 @@ state: mounted name: "{{ swift_devices_mount_point }}/{{ item['fs_label'] }}" with_items: swift_disks + when: inventory_hostname in groups['swift-account-server'] or + inventory_hostname in groups['swift-container-server'] or + inventory_hostname in groups['swift-object-server'] - name: Starting swift-rsyncd container kolla_docker: @@ -43,7 +52,6 @@ volumes: - "{{ node_config_directory }}/swift/:/var/lib/kolla/swift/:ro" - "{{ node_config_directory }}/swift-proxy-server/:{{ container_config_directory }}/:ro" - - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - "/var/lib/kolla/dev/log:/dev/log" when: inventory_hostname in groups['swift-proxy-server'] diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 0fbe29973..880050cfb 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -33,6 +33,5 @@ RUN ln -s swift-base-source/* swift \ {% endif %} -COPY config-swift.sh /usr/local/bin/kolla_config_swift COPY build-swift-ring.py /usr/local/bin/kolla_build_swift_ring RUN mkdir /opt/swift diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index 898103d5e..8d8f73977 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -10,7 +10,4 @@ RUN yum -y install openstack-swift-proxy \ {% endif %} {% endif %} -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start - {{ include_footer }} diff --git a/docker/swift/swift-proxy-server/extend_start.sh b/docker/swift/swift-proxy-server/extend_start.sh deleted file mode 100644 index 8fce9c154..000000000 --- a/docker/swift/swift-proxy-server/extend_start.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -source /usr/local/bin/kolla_config_swift diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2 index 5cb6734fc..7afd4f8c2 100644 --- a/docker/swift/swift-rsyncd/Dockerfile.j2 +++ b/docker/swift/swift-rsyncd/Dockerfile.j2 @@ -13,4 +13,7 @@ RUN apt-get install -y --no-install-recommends rsync \ {% endif %} +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start + {{ include_footer }} diff --git a/docker/swift/swift-base/config-swift.sh b/docker/swift/swift-rsyncd/extend_start.sh index b101b4e69..b101b4e69 100644 --- a/docker/swift/swift-base/config-swift.sh +++ b/docker/swift/swift-rsyncd/extend_start.sh |