Rename cinder-app to cinder to be more consistent

Closes-Bug: #1482986
Change-Id: I72619ef18d24038b46d09e77887d6610ef6e8327

22 files changed, 85 insertions, 0 deletions

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