Merge "Remove unneeded oslo-rootwrap in swift-base"

1 files changed, 9 insertions, 6 deletions

diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index 69a8a4068..c35bc20a5 100644
--- a/docker/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-base/Dockerfile.j2
@@ -7,13 +7,18 @@ MAINTAINER {{ maintainer }}
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
-        {% set swift_base_packages = ['openstack-swift'] %}
+        {% set swift_base_packages = [
+                'openstack-swift'
+            ] 
+        %}
     {% elif base_distro in ['ubuntu'] %}
-        {% set swift_base_packages = ['swift'] %}
+        {% set swift_base_packages = [
+                'swift'
+             ] 
+        %}
     {% endif %}
 
 {{ 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'] %}
@@ -22,6 +27,7 @@ MAINTAINER {{ maintainer }}
     {% endif %}
 
 {{ macros.install_packages(swift_base_packages | customizable("packages")) }}
+
 ADD swift-base-archive /swift-base-source
 RUN ln -s swift-base-source/* swift \
     && useradd --user-group swift \
@@ -29,11 +35,8 @@ RUN ln -s swift-base-source/* swift \
     && mkdir -p /etc/swift /var/cache/swift /var/log/swift /home/swift \
     && cp -r /swift/etc/* /etc/swift/ \
     && chown -R swift: /etc/swift /var/cache/swift /var/log/swift /home/swift
-
 {% endif %}
 
-RUN pip install oslo.rootwrap
-
 COPY swift-rootwrap /var/lib/kolla/venv/bin/swift-rootwrap
 COPY rootwrap.conf /etc/swift/rootwrap.conf
 RUN chmod 755 /var/lib/kolla/venv/bin/swift-rootwrap \