From 8ae3b0d67e92450adf2ae411d64d5710d7da3687 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Wed, 12 Aug 2015 09:04:10 -0700
Subject: Rename cinder-app to cinder to be more consistent

Closes-Bug: #1482986
Change-Id: I72619ef18d24038b46d09e77887d6610ef6e8327
---
 docker/centos/source/cinder-app/cinder-api/Dockerfile      |  9 ---------
 docker/centos/source/cinder-app/cinder-api/build           |  1 -
 docker/centos/source/cinder-app/cinder-api/check.sh        |  1 -
 .../centos/source/cinder-app/cinder-api/config-external.sh |  1 -
 docker/centos/source/cinder-app/cinder-api/start.sh        |  1 -
 docker/centos/source/cinder-app/cinder-backup/Dockerfile   |  7 -------
 docker/centos/source/cinder-app/cinder-backup/build        |  1 -
 .../source/cinder-app/cinder-backup/config-external.sh     |  1 -
 docker/centos/source/cinder-app/cinder-backup/start.sh     |  1 -
 docker/centos/source/cinder-app/cinder-base/.buildinfo     | 10 ----------
 docker/centos/source/cinder-app/cinder-base/Dockerfile     | 14 --------------
 docker/centos/source/cinder-app/cinder-base/build          |  1 -
 docker/centos/source/cinder-app/cinder-data/Dockerfile     |  9 ---------
 docker/centos/source/cinder-app/cinder-data/build          |  1 -
 .../centos/source/cinder-app/cinder-scheduler/Dockerfile   |  7 -------
 docker/centos/source/cinder-app/cinder-scheduler/build     |  1 -
 .../source/cinder-app/cinder-scheduler/config-external.sh  |  1 -
 docker/centos/source/cinder-app/cinder-scheduler/start.sh  |  1 -
 docker/centos/source/cinder-app/cinder-volume/Dockerfile   | 14 --------------
 docker/centos/source/cinder-app/cinder-volume/build        |  1 -
 .../source/cinder-app/cinder-volume/config-external.sh     |  1 -
 docker/centos/source/cinder-app/cinder-volume/start.sh     |  1 -
 docker/centos/source/cinder/cinder-api/Dockerfile          |  9 +++++++++
 docker/centos/source/cinder/cinder-api/build               |  1 +
 docker/centos/source/cinder/cinder-api/check.sh            |  1 +
 docker/centos/source/cinder/cinder-api/config-external.sh  |  1 +
 docker/centos/source/cinder/cinder-api/start.sh            |  1 +
 docker/centos/source/cinder/cinder-backup/Dockerfile       |  7 +++++++
 docker/centos/source/cinder/cinder-backup/build            |  1 +
 .../centos/source/cinder/cinder-backup/config-external.sh  |  1 +
 docker/centos/source/cinder/cinder-backup/start.sh         |  1 +
 docker/centos/source/cinder/cinder-base/.buildinfo         | 10 ++++++++++
 docker/centos/source/cinder/cinder-base/Dockerfile         | 14 ++++++++++++++
 docker/centos/source/cinder/cinder-base/build              |  1 +
 docker/centos/source/cinder/cinder-data/Dockerfile         |  9 +++++++++
 docker/centos/source/cinder/cinder-data/build              |  1 +
 docker/centos/source/cinder/cinder-scheduler/Dockerfile    |  7 +++++++
 docker/centos/source/cinder/cinder-scheduler/build         |  1 +
 .../source/cinder/cinder-scheduler/config-external.sh      |  1 +
 docker/centos/source/cinder/cinder-scheduler/start.sh      |  1 +
 docker/centos/source/cinder/cinder-volume/Dockerfile       | 14 ++++++++++++++
 docker/centos/source/cinder/cinder-volume/build            |  1 +
 .../centos/source/cinder/cinder-volume/config-external.sh  |  1 +
 docker/centos/source/cinder/cinder-volume/start.sh         |  1 +
 44 files changed, 85 insertions(+), 85 deletions(-)
 delete mode 100644 docker/centos/source/cinder-app/cinder-api/Dockerfile
 delete mode 120000 docker/centos/source/cinder-app/cinder-api/build
 delete mode 120000 docker/centos/source/cinder-app/cinder-api/check.sh
 delete mode 120000 docker/centos/source/cinder-app/cinder-api/config-external.sh
 delete mode 120000 docker/centos/source/cinder-app/cinder-api/start.sh
 delete mode 100644 docker/centos/source/cinder-app/cinder-backup/Dockerfile
 delete mode 120000 docker/centos/source/cinder-app/cinder-backup/build
 delete mode 120000 docker/centos/source/cinder-app/cinder-backup/config-external.sh
 delete mode 120000 docker/centos/source/cinder-app/cinder-backup/start.sh
 delete mode 100644 docker/centos/source/cinder-app/cinder-base/.buildinfo
 delete mode 100644 docker/centos/source/cinder-app/cinder-base/Dockerfile
 delete mode 120000 docker/centos/source/cinder-app/cinder-base/build
 delete mode 100644 docker/centos/source/cinder-app/cinder-data/Dockerfile
 delete mode 120000 docker/centos/source/cinder-app/cinder-data/build
 delete mode 100644 docker/centos/source/cinder-app/cinder-scheduler/Dockerfile
 delete mode 120000 docker/centos/source/cinder-app/cinder-scheduler/build
 delete mode 120000 docker/centos/source/cinder-app/cinder-scheduler/config-external.sh
 delete mode 120000 docker/centos/source/cinder-app/cinder-scheduler/start.sh
 delete mode 100644 docker/centos/source/cinder-app/cinder-volume/Dockerfile
 delete mode 120000 docker/centos/source/cinder-app/cinder-volume/build
 delete mode 120000 docker/centos/source/cinder-app/cinder-volume/config-external.sh
 delete mode 120000 docker/centos/source/cinder-app/cinder-volume/start.sh
 create mode 100644 docker/centos/source/cinder/cinder-api/Dockerfile
 create mode 120000 docker/centos/source/cinder/cinder-api/build
 create mode 120000 docker/centos/source/cinder/cinder-api/check.sh
 create mode 120000 docker/centos/source/cinder/cinder-api/config-external.sh
 create mode 120000 docker/centos/source/cinder/cinder-api/start.sh
 create mode 100644 docker/centos/source/cinder/cinder-backup/Dockerfile
 create mode 120000 docker/centos/source/cinder/cinder-backup/build
 create mode 120000 docker/centos/source/cinder/cinder-backup/config-external.sh
 create mode 120000 docker/centos/source/cinder/cinder-backup/start.sh
 create mode 100644 docker/centos/source/cinder/cinder-base/.buildinfo
 create mode 100644 docker/centos/source/cinder/cinder-base/Dockerfile
 create mode 120000 docker/centos/source/cinder/cinder-base/build
 create mode 100644 docker/centos/source/cinder/cinder-data/Dockerfile
 create mode 120000 docker/centos/source/cinder/cinder-data/build
 create mode 100644 docker/centos/source/cinder/cinder-scheduler/Dockerfile
 create mode 120000 docker/centos/source/cinder/cinder-scheduler/build
 create mode 120000 docker/centos/source/cinder/cinder-scheduler/config-external.sh
 create mode 120000 docker/centos/source/cinder/cinder-scheduler/start.sh
 create mode 100644 docker/centos/source/cinder/cinder-volume/Dockerfile
 create mode 120000 docker/centos/source/cinder/cinder-volume/build
 create mode 120000 docker/centos/source/cinder/cinder-volume/config-external.sh
 create mode 120000 docker/centos/source/cinder/cinder-volume/start.sh

(limited to 'docker/centos/source')

diff --git a/docker/centos/source/cinder-app/cinder-api/Dockerfile b/docker/centos/source/cinder-app/cinder-api/Dockerfile
deleted file mode 100644
index 3ce612046..000000000
--- a/docker/centos/source/cinder-app/cinder-api/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN pip install python-keystoneclient
-
-COPY config-external.sh /opt/kolla/
-COPY ./start.sh ./check.sh /
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/cinder-app/cinder-api/build b/docker/centos/source/cinder-app/cinder-api/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/cinder-app/cinder-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder-app/cinder-api/check.sh b/docker/centos/source/cinder-app/cinder-api/check.sh
deleted file mode 120000
index 829110b45..000000000
--- a/docker/centos/source/cinder-app/cinder-api/check.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder-app/cinder-api/check.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder-app/cinder-api/config-external.sh b/docker/centos/source/cinder-app/cinder-api/config-external.sh
deleted file mode 120000
index 5b577f290..000000000
--- a/docker/centos/source/cinder-app/cinder-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder-app/cinder-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder-app/cinder-api/start.sh b/docker/centos/source/cinder-app/cinder-api/start.sh
deleted file mode 120000
index 33182c78c..000000000
--- a/docker/centos/source/cinder-app/cinder-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder-app/cinder-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder-app/cinder-backup/Dockerfile b/docker/centos/source/cinder-app/cinder-backup/Dockerfile
deleted file mode 100644
index 70b8d8202..000000000
--- a/docker/centos/source/cinder-app/cinder-backup/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/cinder-app/cinder-backup/build b/docker/centos/source/cinder-app/cinder-backup/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/cinder-app/cinder-backup/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder-app/cinder-backup/config-external.sh b/docker/centos/source/cinder-app/cinder-backup/config-external.sh
deleted file mode 120000
index c80c21a20..000000000
--- a/docker/centos/source/cinder-app/cinder-backup/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder-app/cinder-backup/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder-app/cinder-backup/start.sh b/docker/centos/source/cinder-app/cinder-backup/start.sh
deleted file mode 120000
index c21a17f09..000000000
--- a/docker/centos/source/cinder-app/cinder-backup/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder-app/cinder-backup/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder-app/cinder-base/.buildinfo b/docker/centos/source/cinder-app/cinder-base/.buildinfo
deleted file mode 100644
index 05cb8abab..000000000
--- a/docker/centos/source/cinder-app/cinder-base/.buildinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=cinder
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/cinder}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/cinder/cinder-master.tar.gz}
diff --git a/docker/centos/source/cinder-app/cinder-base/Dockerfile b/docker/centos/source/cinder-app/cinder-base/Dockerfile
deleted file mode 100644
index f07058bb9..000000000
--- a/docker/centos/source/cinder-app/cinder-base/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-ADD ./cinder.tar /
-RUN ln -s /cinder-* /cinder
-
-RUN cd /cinder \
-    && useradd --user-group cinder \
-    && pip install -r requirements.txt \
-    && pip install /cinder \
-    && mkdir /etc/cinder /var/log/cinder \
-    && cp -r /cinder/etc/cinder/* /etc/cinder/ \
-    && chown -R cinder: /etc/cinder /var/log/cinder \
-    && rm -rf /root/.cache
diff --git a/docker/centos/source/cinder-app/cinder-base/build b/docker/centos/source/cinder-app/cinder-base/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/cinder-app/cinder-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder-app/cinder-data/Dockerfile b/docker/centos/source/cinder-app/cinder-data/Dockerfile
deleted file mode 100644
index 117e74da1..000000000
--- a/docker/centos/source/cinder-app/cinder-data/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN mkdir -p /opt/data
-VOLUME [ "/opt/data" ]
-
-# Command needed to start the data container.
-# Note: data containers do not need to be persistent.
-CMD ["/bin/true"]
diff --git a/docker/centos/source/cinder-app/cinder-data/build b/docker/centos/source/cinder-app/cinder-data/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/cinder-app/cinder-data/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder-app/cinder-scheduler/Dockerfile b/docker/centos/source/cinder-app/cinder-scheduler/Dockerfile
deleted file mode 100644
index 70b8d8202..000000000
--- a/docker/centos/source/cinder-app/cinder-scheduler/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/cinder-app/cinder-scheduler/build b/docker/centos/source/cinder-app/cinder-scheduler/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/cinder-app/cinder-scheduler/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder-app/cinder-scheduler/config-external.sh b/docker/centos/source/cinder-app/cinder-scheduler/config-external.sh
deleted file mode 120000
index 976249002..000000000
--- a/docker/centos/source/cinder-app/cinder-scheduler/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder-app/cinder-scheduler/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder-app/cinder-scheduler/start.sh b/docker/centos/source/cinder-app/cinder-scheduler/start.sh
deleted file mode 120000
index a91c95ebd..000000000
--- a/docker/centos/source/cinder-app/cinder-scheduler/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder-app/cinder-scheduler/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder-app/cinder-volume/Dockerfile b/docker/centos/source/cinder-app/cinder-volume/Dockerfile
deleted file mode 100644
index c7d6c9446..000000000
--- a/docker/centos/source/cinder-app/cinder-volume/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Install required packages
-RUN yum install -y \
-        lvm2 \
-        scsi-target-utils \
-    && yum clean all
-
-# Add start scripts
-COPY config-external.sh /opt/kolla/
-COPY start.sh /start.sh
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/cinder-app/cinder-volume/build b/docker/centos/source/cinder-app/cinder-volume/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/cinder-app/cinder-volume/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder-app/cinder-volume/config-external.sh b/docker/centos/source/cinder-app/cinder-volume/config-external.sh
deleted file mode 120000
index 1f6476f2e..000000000
--- a/docker/centos/source/cinder-app/cinder-volume/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder-app/cinder-volume/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder-app/cinder-volume/start.sh b/docker/centos/source/cinder-app/cinder-volume/start.sh
deleted file mode 120000
index f79df7c47..000000000
--- a/docker/centos/source/cinder-app/cinder-volume/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder-app/cinder-volume/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-api/Dockerfile b/docker/centos/source/cinder/cinder-api/Dockerfile
new file mode 100644
index 000000000..3ce612046
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-api/Dockerfile
@@ -0,0 +1,9 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+RUN pip install python-keystoneclient
+
+COPY config-external.sh /opt/kolla/
+COPY ./start.sh ./check.sh /
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/cinder/cinder-api/build b/docker/centos/source/cinder/cinder-api/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-api/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-api/check.sh b/docker/centos/source/cinder/cinder-api/check.sh
new file mode 120000
index 000000000..50260e7b1
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-api/check.sh
@@ -0,0 +1 @@
+../../../../common/cinder/cinder-api/check.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-api/config-external.sh b/docker/centos/source/cinder/cinder-api/config-external.sh
new file mode 120000
index 000000000..0e9409e98
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-api/config-external.sh
@@ -0,0 +1 @@
+../../../../common/cinder/cinder-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-api/start.sh b/docker/centos/source/cinder/cinder-api/start.sh
new file mode 120000
index 000000000..4b6c5f104
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-api/start.sh
@@ -0,0 +1 @@
+../../../../common/cinder/cinder-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-backup/Dockerfile b/docker/centos/source/cinder/cinder-backup/Dockerfile
new file mode 100644
index 000000000..70b8d8202
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-backup/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY ./start.sh /start.sh
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/cinder/cinder-backup/build b/docker/centos/source/cinder/cinder-backup/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-backup/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-backup/config-external.sh b/docker/centos/source/cinder/cinder-backup/config-external.sh
new file mode 120000
index 000000000..4c6f65d40
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-backup/config-external.sh
@@ -0,0 +1 @@
+../../../../common/cinder/cinder-backup/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-backup/start.sh b/docker/centos/source/cinder/cinder-backup/start.sh
new file mode 120000
index 000000000..62ae41b03
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-backup/start.sh
@@ -0,0 +1 @@
+../../../../common/cinder/cinder-backup/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-base/.buildinfo b/docker/centos/source/cinder/cinder-base/.buildinfo
new file mode 100644
index 000000000..05cb8abab
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-base/.buildinfo
@@ -0,0 +1,10 @@
+# Build info specific to this image. All values can be overridden in .buildconf
+
+COMPONENT=cinder
+SOURCE_INSTALL_AVAILABLE=1
+
+# Used for git install method
+: ${CLONE_FROM:=https://github.com/openstack/cinder}
+
+# Used for curl install method
+: ${TARBALL_URI:=http://tarballs.openstack.org/cinder/cinder-master.tar.gz}
diff --git a/docker/centos/source/cinder/cinder-base/Dockerfile b/docker/centos/source/cinder/cinder-base/Dockerfile
new file mode 100644
index 000000000..f07058bb9
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-base/Dockerfile
@@ -0,0 +1,14 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./cinder.tar /
+RUN ln -s /cinder-* /cinder
+
+RUN cd /cinder \
+    && useradd --user-group cinder \
+    && pip install -r requirements.txt \
+    && pip install /cinder \
+    && mkdir /etc/cinder /var/log/cinder \
+    && cp -r /cinder/etc/cinder/* /etc/cinder/ \
+    && chown -R cinder: /etc/cinder /var/log/cinder \
+    && rm -rf /root/.cache
diff --git a/docker/centos/source/cinder/cinder-base/build b/docker/centos/source/cinder/cinder-base/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-data/Dockerfile b/docker/centos/source/cinder/cinder-data/Dockerfile
new file mode 100644
index 000000000..117e74da1
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-data/Dockerfile
@@ -0,0 +1,9 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+RUN mkdir -p /opt/data
+VOLUME [ "/opt/data" ]
+
+# Command needed to start the data container.
+# Note: data containers do not need to be persistent.
+CMD ["/bin/true"]
diff --git a/docker/centos/source/cinder/cinder-data/build b/docker/centos/source/cinder/cinder-data/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-data/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-scheduler/Dockerfile b/docker/centos/source/cinder/cinder-scheduler/Dockerfile
new file mode 100644
index 000000000..70b8d8202
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-scheduler/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY ./start.sh /start.sh
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/cinder/cinder-scheduler/build b/docker/centos/source/cinder/cinder-scheduler/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-scheduler/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-scheduler/config-external.sh b/docker/centos/source/cinder/cinder-scheduler/config-external.sh
new file mode 120000
index 000000000..f6d26aba5
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-scheduler/config-external.sh
@@ -0,0 +1 @@
+../../../../common/cinder/cinder-scheduler/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-scheduler/start.sh b/docker/centos/source/cinder/cinder-scheduler/start.sh
new file mode 120000
index 000000000..0953c6457
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-scheduler/start.sh
@@ -0,0 +1 @@
+../../../../common/cinder/cinder-scheduler/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-volume/Dockerfile b/docker/centos/source/cinder/cinder-volume/Dockerfile
new file mode 100644
index 000000000..c7d6c9446
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-volume/Dockerfile
@@ -0,0 +1,14 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+# Install required packages
+RUN yum install -y \
+        lvm2 \
+        scsi-target-utils \
+    && yum clean all
+
+# Add start scripts
+COPY config-external.sh /opt/kolla/
+COPY start.sh /start.sh
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/cinder/cinder-volume/build b/docker/centos/source/cinder/cinder-volume/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-volume/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-volume/config-external.sh b/docker/centos/source/cinder/cinder-volume/config-external.sh
new file mode 120000
index 000000000..abcdd6bc4
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-volume/config-external.sh
@@ -0,0 +1 @@
+../../../../common/cinder/cinder-volume/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-volume/start.sh b/docker/centos/source/cinder/cinder-volume/start.sh
new file mode 120000
index 000000000..471a5ebd7
--- /dev/null
+++ b/docker/centos/source/cinder/cinder-volume/start.sh
@@ -0,0 +1 @@
+../../../../common/cinder/cinder-volume/start.sh
\ No newline at end of file
-- 
cgit v1.2.3