From f7b453d95b9ce3efd45071134b143712b879f98e Mon Sep 17 00:00:00 2001
From: James McCarthy <james.m.mccarthy@oracle.com>
Date: Fri, 24 Nov 2017 12:40:32 +0000
Subject: Update swift for replication issues

There are corresponding ansible changes to go with these image
changes - add nc to swift image, and create dir for lock files.

nc allows for rsync replication to easily target {{ swift_rsync_port }}

change the lock file location for swift user to access - see bug
for more details.

Change-Id: I78826aeee35601ff65cbe50932482ef2f68346ae
Closes-Bug: #1733851
---
 docker/swift/swift-base/Dockerfile.j2     | 10 ++++++----
 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
-- 
cgit v1.2.3