From 946a7cae5473ddbbdb23279a83cb00e31d85129e Mon Sep 17 00:00:00 2001
From: Saravanakumar Arumugam <sarumuga@redhat.com>
Date: Tue, 7 Nov 2017 14:51:24 +0530
Subject: Turn on S3 ACL support. Add python-setuptools to install, as it is a
requirement with openstack-newton
Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
---
gluster-s3object/CentOS/docker-gluster-s3/Dockerfile | 2 +-
gluster-s3object/CentOS/docker-gluster-s3/etc/swift/proxy-server.conf | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
(limited to 'gluster-s3object/CentOS')
diff --git a/gluster-s3object/CentOS/docker-gluster-s3/Dockerfile b/gluster-s3object/CentOS/docker-gluster-s3/Dockerfile
index 66474e3..9c857f4 100644
--- a/gluster-s3object/CentOS/docker-gluster-s3/Dockerfile
+++ b/gluster-s3object/CentOS/docker-gluster-s3/Dockerfile
@@ -25,7 +25,7 @@ RUN yum -v --setopt=tsflags=nodocs -y update && \
epel-release && \
yum -v --setopt=tsflags=nodocs -y install \
openstack-swift openstack-swift-{proxy,account,container,object,plugin-swift3} \
- git memcached python-prettytable && \
+ git memcached python-prettytable python-setuptools && \
yum -y install systemd && \
(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
rm -f /lib/systemd/system/multi-user.target.wants/*;\
diff --git a/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/proxy-server.conf b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/proxy-server.conf
index 8e6ecc5..f999eaf 100644
--- a/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/proxy-server.conf
+++ b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/proxy-server.conf
@@ -97,6 +97,7 @@ user_test5_tester5 = testing5 service
[filter:swift3]
use = egg:swift3#swift3
+s3_acl = true
[filter:gswauth]
use = egg:gluster_swift#gswauth
--
cgit v1.2.3