diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-05 14:09:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-05 14:09:42 +0000 |
| commit | 628af2f8b0dd413e9803d2c5973163dce4efa6f7 (patch) | |
| tree | 2b4aef57b9a8af6a524a86e21431fd914860c61a /docker | |
| parent | cfa3e7d6791031d28ad5a57c03d6baf1e296846a (diff) | |
| parent | f7b453d95b9ce3efd45071134b143712b879f98e (diff) | |
| download | kolla-628af2f8b0dd413e9803d2c5973163dce4efa6f7.tar.gz kolla-628af2f8b0dd413e9803d2c5973163dce4efa6f7.zip | |
Merge "Update swift for replication issues"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/swift/swift-base/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | docker/swift/swift-rsyncd/extend_start.sh | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 929b77f94..b4caa5b29 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -10,12 +10,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set swift_base_packages = [ - 'openstack-swift' + 'openstack-swift', + 'nmap-ncat' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set swift_base_packages = [ - 'swift' + 'swift', + 'netcat-openbsd' ] %} {% endif %} @@ -23,9 +25,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(swift_base_packages | customizable("packages")) }} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set swift_base_packages = ['liberasurecode-devel'] %} + {% set swift_base_packages = ['liberasurecode-devel','nmap-ncat'] %} {% elif base_distro in ['debian', 'ubuntu'] %} - {% set swift_base_packages = ['liberasurecode-dev'] %} + {% set swift_base_packages = ['liberasurecode-dev','netcat-openbsd'] %} {% endif %} {{ macros.install_packages(swift_base_packages | customizable("packages")) }} diff --git a/docker/swift/swift-rsyncd/extend_start.sh b/docker/swift/swift-rsyncd/extend_start.sh index d432b82fb..86d24724b 100644 --- a/docker/swift/swift-rsyncd/extend_start.sh +++ b/docker/swift/swift-rsyncd/extend_start.sh @@ -1,3 +1,4 @@ #!/bin/bash sudo chown -R swift:swift /srv/node +mkdir -p /var/lib/swift/lock |