From b209da1306c454366210e88f5a7a0e14bdd88fc4 Mon Sep 17 00:00:00 2001
From: Qiu Yu <qiuyu@ebaysf.com>
Date: Fri, 29 Jan 2016 12:06:31 -0700
Subject: Fix Swift for multinode P+ACO deployment

Current Swift playbook is based on the preassumption of AIO setup.
However, if one goes with default multinode setup
(ansible/inventory/multinode), it follows the P + ACO deployment model,
which proxy-server runs on controller nodes where ACO
(account/container/object services) run on storage nodes.

It will break because swift proxy-server no longer has access (it
shouldn't have) to /srv/node path. This change ensure disk mounting part
only happens on storage node. It also moves chown from proxy-server
Dockerfile to rsyncd because no matter with PACO, P+ACO or P+A+C+O
model, rsyncd is always running on each storage node.

Change-Id: I3aa20454902caa9c84d3901bb91e4e4c93ac5f34
Partially-Implements: blueprint swift-physical-disk
Closes-Bug: #1537544
---
 docker/swift/swift-base/Dockerfile.j2           | 1 -
 docker/swift/swift-base/config-swift.sh         | 3 ---
 docker/swift/swift-proxy-server/Dockerfile.j2   | 3 ---
 docker/swift/swift-proxy-server/extend_start.sh | 3 ---
 docker/swift/swift-rsyncd/Dockerfile.j2         | 3 +++
 docker/swift/swift-rsyncd/extend_start.sh       | 3 +++
 6 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 docker/swift/swift-base/config-swift.sh
 delete mode 100644 docker/swift/swift-proxy-server/extend_start.sh
 create mode 100644 docker/swift/swift-rsyncd/extend_start.sh

(limited to 'docker')

diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index 0fbe29973..880050cfb 100644
--- a/docker/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-base/Dockerfile.j2
@@ -33,6 +33,5 @@ RUN ln -s swift-base-source/* swift \
 
 {% endif %}
 
-COPY config-swift.sh /usr/local/bin/kolla_config_swift
 COPY build-swift-ring.py /usr/local/bin/kolla_build_swift_ring
 RUN mkdir /opt/swift
diff --git a/docker/swift/swift-base/config-swift.sh b/docker/swift/swift-base/config-swift.sh
deleted file mode 100644
index b101b4e69..000000000
--- a/docker/swift/swift-base/config-swift.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-chown -R swift: /srv/node
diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2
index 898103d5e..8d8f73977 100644
--- a/docker/swift/swift-proxy-server/Dockerfile.j2
+++ b/docker/swift/swift-proxy-server/Dockerfile.j2
@@ -10,7 +10,4 @@ RUN yum -y install openstack-swift-proxy \
     {% endif %}
 {% endif %}
 
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start
-
 {{ include_footer }}
diff --git a/docker/swift/swift-proxy-server/extend_start.sh b/docker/swift/swift-proxy-server/extend_start.sh
deleted file mode 100644
index 8fce9c154..000000000
--- a/docker/swift/swift-proxy-server/extend_start.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-source /usr/local/bin/kolla_config_swift
diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2
index 5cb6734fc..7afd4f8c2 100644
--- a/docker/swift/swift-rsyncd/Dockerfile.j2
+++ b/docker/swift/swift-rsyncd/Dockerfile.j2
@@ -13,4 +13,7 @@ RUN apt-get install -y --no-install-recommends rsync \
 
 {% endif %}
 
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start
+
 {{ include_footer }}
diff --git a/docker/swift/swift-rsyncd/extend_start.sh b/docker/swift/swift-rsyncd/extend_start.sh
new file mode 100644
index 000000000..b101b4e69
--- /dev/null
+++ b/docker/swift/swift-rsyncd/extend_start.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+chown -R swift: /srv/node
-- 
cgit v1.2.3