Merge "Update swift for replication issues"

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")) }}

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