openstack
/
kolla
Code Issues Proposed changes

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
This commit is contained in:
James McCarthy 2017-11-24 12:40:32 +00:00
parent 781c106f98
commit f7b453d95b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/swift/swift-base/Dockerfile.j2
View File

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

1
docker/swift/swift-rsyncd/extend_start.sh
View File

@ -1,3 +1,4 @@
#!/bin/bash
sudo chown -R swift:swift /srv/node
mkdir -p /var/lib/swift/lock