Rename cinder-app to cinder to be more consistent

Closes-Bug: #1482986
Change-Id: I72619ef18d24038b46d09e77887d6610ef6e8327

21 files changed, 0 insertions, 61 deletions

diff --git a/docker/centos/binary/cinder-app/cinder-api/Dockerfile b/docker/centos/binary/cinder-app/cinder-api/Dockerfile
deleted file mode 100644
index 98899a79b..000000000
--- a/docker/centos/binary/cinder-app/cinder-api/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y python-keystone && yum clean all
-COPY config-external.sh /opt/kolla/
-COPY ./start.sh ./check.sh /
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/cinder-app/cinder-api/build b/docker/centos/binary/cinder-app/cinder-api/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-api/check.sh b/docker/centos/binary/cinder-app/cinder-api/check.sh
deleted file mode 120000
index 829110b45..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-api/config-external.sh b/docker/centos/binary/cinder-app/cinder-api/config-external.sh
deleted file mode 120000
index 5b577f290..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-api/start.sh b/docker/centos/binary/cinder-app/cinder-api/start.sh
deleted file mode 120000
index 33182c78c..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-backup/Dockerfile b/docker/centos/binary/cinder-app/cinder-backup/Dockerfile
deleted file mode 100644
index 70b8d8202..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-backup/build b/docker/centos/binary/cinder-app/cinder-backup/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-backup/config-external.sh b/docker/centos/binary/cinder-app/cinder-backup/config-external.sh
deleted file mode 120000
index c80c21a20..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-backup/start.sh b/docker/centos/binary/cinder-app/cinder-backup/start.sh
deleted file mode 120000
index c21a17f09..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-base/Dockerfile b/docker/centos/binary/cinder-app/cinder-base/Dockerfile
deleted file mode 100644
index fb8dea608..000000000
--- a/docker/centos/binary/cinder-app/cinder-base/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-cinder automaton && yum clean all
diff --git a/docker/centos/binary/cinder-app/cinder-base/build b/docker/centos/binary/cinder-app/cinder-base/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-data/Dockerfile b/docker/centos/binary/cinder-app/cinder-data/Dockerfile
deleted file mode 100644
index 117e74da1..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-data/build b/docker/centos/binary/cinder-app/cinder-data/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-scheduler/Dockerfile b/docker/centos/binary/cinder-app/cinder-scheduler/Dockerfile
deleted file mode 100644
index 70b8d8202..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-scheduler/build b/docker/centos/binary/cinder-app/cinder-scheduler/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-scheduler/config-external.sh b/docker/centos/binary/cinder-app/cinder-scheduler/config-external.sh
deleted file mode 120000
index 976249002..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-scheduler/start.sh b/docker/centos/binary/cinder-app/cinder-scheduler/start.sh
deleted file mode 120000
index a91c95ebd..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-volume/Dockerfile b/docker/centos/binary/cinder-app/cinder-volume/Dockerfile
deleted file mode 100644
index 17412fefa..000000000
--- a/docker/centos/binary/cinder-app/cinder-volume/Dockerfile
+++ /dev/null
@@ -1,11 +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/binary/cinder-app/cinder-volume/build b/docker/centos/binary/cinder-app/cinder-volume/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-volume/config-external.sh b/docker/centos/binary/cinder-app/cinder-volume/config-external.sh
deleted file mode 120000
index 1f6476f2e..000000000
--- a/docker/centos/binary/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/binary/cinder-app/cinder-volume/start.sh b/docker/centos/binary/cinder-app/cinder-volume/start.sh
deleted file mode 120000
index f79df7c47..000000000
--- a/docker/centos/binary/cinder-app/cinder-volume/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder-app/cinder-volume/start.sh
\ No newline at end of file