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: [PATCH] Rename cinder-app to cinder to be more consistent
Closes-Bug: #1482986
Change-Id: I72619ef18d24038b46d09e77887d6610ef6e8327
---
docker/centos/binary/cinder-app/cinder-api/check.sh | 1 -
docker/centos/binary/cinder-app/cinder-api/config-external.sh | 1 -
docker/centos/binary/cinder-app/cinder-api/start.sh | 1 -
docker/centos/binary/cinder-app/cinder-backup/config-external.sh | 1 -
docker/centos/binary/cinder-app/cinder-backup/start.sh | 1 -
.../centos/binary/cinder-app/cinder-scheduler/config-external.sh | 1 -
docker/centos/binary/cinder-app/cinder-scheduler/start.sh | 1 -
docker/centos/binary/cinder-app/cinder-volume/config-external.sh | 1 -
docker/centos/binary/cinder-app/cinder-volume/start.sh | 1 -
.../centos/binary/{cinder-app => cinder}/cinder-api/Dockerfile | 0
docker/centos/binary/{cinder-app => cinder}/cinder-api/build | 0
docker/centos/binary/cinder/cinder-api/check.sh | 1 +
docker/centos/binary/cinder/cinder-api/config-external.sh | 1 +
docker/centos/binary/cinder/cinder-api/start.sh | 1 +
.../binary/{cinder-app => cinder}/cinder-backup/Dockerfile | 0
docker/centos/binary/{cinder-app => cinder}/cinder-backup/build | 0
docker/centos/binary/cinder/cinder-backup/config-external.sh | 1 +
docker/centos/binary/cinder/cinder-backup/start.sh | 1 +
.../centos/binary/{cinder-app => cinder}/cinder-base/Dockerfile | 0
docker/centos/binary/{cinder-app => cinder}/cinder-base/build | 0
.../centos/binary/{cinder-app => cinder}/cinder-data/Dockerfile | 0
docker/centos/binary/{cinder-app => cinder}/cinder-data/build | 0
.../binary/{cinder-app => cinder}/cinder-scheduler/Dockerfile | 0
.../centos/binary/{cinder-app => cinder}/cinder-scheduler/build | 0
docker/centos/binary/cinder/cinder-scheduler/config-external.sh | 1 +
docker/centos/binary/cinder/cinder-scheduler/start.sh | 1 +
.../binary/{cinder-app => cinder}/cinder-volume/Dockerfile | 0
docker/centos/binary/{cinder-app => cinder}/cinder-volume/build | 0
docker/centos/binary/cinder/cinder-volume/config-external.sh | 1 +
docker/centos/binary/cinder/cinder-volume/start.sh | 1 +
docker/centos/source/cinder-app/cinder-api/check.sh | 1 -
docker/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/config-external.sh | 1 -
docker/centos/source/cinder-app/cinder-backup/start.sh | 1 -
.../centos/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/config-external.sh | 1 -
docker/centos/source/cinder-app/cinder-volume/start.sh | 1 -
.../centos/source/{cinder-app => cinder}/cinder-api/Dockerfile | 0
docker/centos/source/{cinder-app => cinder}/cinder-api/build | 0
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 +
.../source/{cinder-app => cinder}/cinder-backup/Dockerfile | 0
docker/centos/source/{cinder-app => cinder}/cinder-backup/build | 0
docker/centos/source/cinder/cinder-backup/config-external.sh | 1 +
docker/centos/source/cinder/cinder-backup/start.sh | 1 +
.../centos/source/{cinder-app => cinder}/cinder-base/.buildinfo | 0
.../centos/source/{cinder-app => cinder}/cinder-base/Dockerfile | 0
docker/centos/source/{cinder-app => cinder}/cinder-base/build | 0
.../centos/source/{cinder-app => cinder}/cinder-data/Dockerfile | 0
docker/centos/source/{cinder-app => cinder}/cinder-data/build | 0
.../source/{cinder-app => cinder}/cinder-scheduler/Dockerfile | 0
.../centos/source/{cinder-app => cinder}/cinder-scheduler/build | 0
docker/centos/source/cinder/cinder-scheduler/config-external.sh | 1 +
docker/centos/source/cinder/cinder-scheduler/start.sh | 1 +
.../source/{cinder-app => cinder}/cinder-volume/Dockerfile | 0
docker/centos/source/{cinder-app => cinder}/cinder-volume/build | 0
docker/centos/source/cinder/cinder-volume/config-external.sh | 1 +
docker/centos/source/cinder/cinder-volume/start.sh | 1 +
docker/common/{cinder-app => cinder}/cinder-api/check.sh | 0
.../common/{cinder-app => cinder}/cinder-api/config-external.sh | 0
docker/common/{cinder-app => cinder}/cinder-api/start.sh | 0
.../{cinder-app => cinder}/cinder-backup/config-external.sh | 0
docker/common/{cinder-app => cinder}/cinder-backup/start.sh | 0
.../{cinder-app => cinder}/cinder-scheduler/config-external.sh | 0
docker/common/{cinder-app => cinder}/cinder-scheduler/start.sh | 0
.../{cinder-app => cinder}/cinder-volume/config-external.sh | 0
docker/common/{cinder-app => cinder}/cinder-volume/start.sh | 0
docker/fedora/binary/cinder-app | 1 -
docker/fedora/source/cinder-app | 1 -
docker/rhel/binary/cinder-app | 1 -
73 files changed, 18 insertions(+), 21 deletions(-)
delete mode 120000 docker/centos/binary/cinder-app/cinder-api/check.sh
delete mode 120000 docker/centos/binary/cinder-app/cinder-api/config-external.sh
delete mode 120000 docker/centos/binary/cinder-app/cinder-api/start.sh
delete mode 120000 docker/centos/binary/cinder-app/cinder-backup/config-external.sh
delete mode 120000 docker/centos/binary/cinder-app/cinder-backup/start.sh
delete mode 120000 docker/centos/binary/cinder-app/cinder-scheduler/config-external.sh
delete mode 120000 docker/centos/binary/cinder-app/cinder-scheduler/start.sh
delete mode 120000 docker/centos/binary/cinder-app/cinder-volume/config-external.sh
delete mode 120000 docker/centos/binary/cinder-app/cinder-volume/start.sh
rename docker/centos/binary/{cinder-app => cinder}/cinder-api/Dockerfile (100%)
rename docker/centos/binary/{cinder-app => cinder}/cinder-api/build (100%)
create mode 120000 docker/centos/binary/cinder/cinder-api/check.sh
create mode 120000 docker/centos/binary/cinder/cinder-api/config-external.sh
create mode 120000 docker/centos/binary/cinder/cinder-api/start.sh
rename docker/centos/binary/{cinder-app => cinder}/cinder-backup/Dockerfile (100%)
rename docker/centos/binary/{cinder-app => cinder}/cinder-backup/build (100%)
create mode 120000 docker/centos/binary/cinder/cinder-backup/config-external.sh
create mode 120000 docker/centos/binary/cinder/cinder-backup/start.sh
rename docker/centos/binary/{cinder-app => cinder}/cinder-base/Dockerfile (100%)
rename docker/centos/binary/{cinder-app => cinder}/cinder-base/build (100%)
rename docker/centos/binary/{cinder-app => cinder}/cinder-data/Dockerfile (100%)
rename docker/centos/binary/{cinder-app => cinder}/cinder-data/build (100%)
rename docker/centos/binary/{cinder-app => cinder}/cinder-scheduler/Dockerfile (100%)
rename docker/centos/binary/{cinder-app => cinder}/cinder-scheduler/build (100%)
create mode 120000 docker/centos/binary/cinder/cinder-scheduler/config-external.sh
create mode 120000 docker/centos/binary/cinder/cinder-scheduler/start.sh
rename docker/centos/binary/{cinder-app => cinder}/cinder-volume/Dockerfile (100%)
rename docker/centos/binary/{cinder-app => cinder}/cinder-volume/build (100%)
create mode 120000 docker/centos/binary/cinder/cinder-volume/config-external.sh
create mode 120000 docker/centos/binary/cinder/cinder-volume/start.sh
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 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 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 120000 docker/centos/source/cinder-app/cinder-volume/config-external.sh
delete mode 120000 docker/centos/source/cinder-app/cinder-volume/start.sh
rename docker/centos/source/{cinder-app => cinder}/cinder-api/Dockerfile (100%)
rename docker/centos/source/{cinder-app => cinder}/cinder-api/build (100%)
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
rename docker/centos/source/{cinder-app => cinder}/cinder-backup/Dockerfile (100%)
rename docker/centos/source/{cinder-app => cinder}/cinder-backup/build (100%)
create mode 120000 docker/centos/source/cinder/cinder-backup/config-external.sh
create mode 120000 docker/centos/source/cinder/cinder-backup/start.sh
rename docker/centos/source/{cinder-app => cinder}/cinder-base/.buildinfo (100%)
rename docker/centos/source/{cinder-app => cinder}/cinder-base/Dockerfile (100%)
rename docker/centos/source/{cinder-app => cinder}/cinder-base/build (100%)
rename docker/centos/source/{cinder-app => cinder}/cinder-data/Dockerfile (100%)
rename docker/centos/source/{cinder-app => cinder}/cinder-data/build (100%)
rename docker/centos/source/{cinder-app => cinder}/cinder-scheduler/Dockerfile (100%)
rename docker/centos/source/{cinder-app => cinder}/cinder-scheduler/build (100%)
create mode 120000 docker/centos/source/cinder/cinder-scheduler/config-external.sh
create mode 120000 docker/centos/source/cinder/cinder-scheduler/start.sh
rename docker/centos/source/{cinder-app => cinder}/cinder-volume/Dockerfile (100%)
rename docker/centos/source/{cinder-app => cinder}/cinder-volume/build (100%)
create mode 120000 docker/centos/source/cinder/cinder-volume/config-external.sh
create mode 120000 docker/centos/source/cinder/cinder-volume/start.sh
rename docker/common/{cinder-app => cinder}/cinder-api/check.sh (100%)
rename docker/common/{cinder-app => cinder}/cinder-api/config-external.sh (100%)
rename docker/common/{cinder-app => cinder}/cinder-api/start.sh (100%)
rename docker/common/{cinder-app => cinder}/cinder-backup/config-external.sh (100%)
rename docker/common/{cinder-app => cinder}/cinder-backup/start.sh (100%)
rename docker/common/{cinder-app => cinder}/cinder-scheduler/config-external.sh (100%)
rename docker/common/{cinder-app => cinder}/cinder-scheduler/start.sh (100%)
rename docker/common/{cinder-app => cinder}/cinder-volume/config-external.sh (100%)
rename docker/common/{cinder-app => cinder}/cinder-volume/start.sh (100%)
delete mode 120000 docker/fedora/binary/cinder-app
delete mode 120000 docker/fedora/source/cinder-app
delete mode 120000 docker/rhel/binary/cinder-app
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 829110b458..0000000000
--- 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 5b577f2903..0000000000
--- 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 33182c78cf..0000000000
--- 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/config-external.sh b/docker/centos/binary/cinder-app/cinder-backup/config-external.sh
deleted file mode 120000
index c80c21a204..0000000000
--- 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 c21a17f09a..0000000000
--- 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-scheduler/config-external.sh b/docker/centos/binary/cinder-app/cinder-scheduler/config-external.sh
deleted file mode 120000
index 9762490029..0000000000
--- 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 a91c95ebda..0000000000
--- 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/config-external.sh b/docker/centos/binary/cinder-app/cinder-volume/config-external.sh
deleted file mode 120000
index 1f6476f2eb..0000000000
--- 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 f79df7c470..0000000000
--- 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
diff --git a/docker/centos/binary/cinder-app/cinder-api/Dockerfile b/docker/centos/binary/cinder/cinder-api/Dockerfile
similarity index 100%
rename from docker/centos/binary/cinder-app/cinder-api/Dockerfile
rename to docker/centos/binary/cinder/cinder-api/Dockerfile
diff --git a/docker/centos/binary/cinder-app/cinder-api/build b/docker/centos/binary/cinder/cinder-api/build
similarity index 100%
rename from docker/centos/binary/cinder-app/cinder-api/build
rename to docker/centos/binary/cinder/cinder-api/build
diff --git a/docker/centos/binary/cinder/cinder-api/check.sh b/docker/centos/binary/cinder/cinder-api/check.sh
new file mode 120000
index 0000000000..50260e7b15
--- /dev/null
+++ b/docker/centos/binary/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/binary/cinder/cinder-api/config-external.sh b/docker/centos/binary/cinder/cinder-api/config-external.sh
new file mode 120000
index 0000000000..0e9409e986
--- /dev/null
+++ b/docker/centos/binary/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/binary/cinder/cinder-api/start.sh b/docker/centos/binary/cinder/cinder-api/start.sh
new file mode 120000
index 0000000000..4b6c5f104a
--- /dev/null
+++ b/docker/centos/binary/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/binary/cinder-app/cinder-backup/Dockerfile b/docker/centos/binary/cinder/cinder-backup/Dockerfile
similarity index 100%
rename from docker/centos/binary/cinder-app/cinder-backup/Dockerfile
rename to docker/centos/binary/cinder/cinder-backup/Dockerfile
diff --git a/docker/centos/binary/cinder-app/cinder-backup/build b/docker/centos/binary/cinder/cinder-backup/build
similarity index 100%
rename from docker/centos/binary/cinder-app/cinder-backup/build
rename to docker/centos/binary/cinder/cinder-backup/build
diff --git a/docker/centos/binary/cinder/cinder-backup/config-external.sh b/docker/centos/binary/cinder/cinder-backup/config-external.sh
new file mode 120000
index 0000000000..4c6f65d405
--- /dev/null
+++ b/docker/centos/binary/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/binary/cinder/cinder-backup/start.sh b/docker/centos/binary/cinder/cinder-backup/start.sh
new file mode 120000
index 0000000000..62ae41b035
--- /dev/null
+++ b/docker/centos/binary/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/binary/cinder-app/cinder-base/Dockerfile b/docker/centos/binary/cinder/cinder-base/Dockerfile
similarity index 100%
rename from docker/centos/binary/cinder-app/cinder-base/Dockerfile
rename to docker/centos/binary/cinder/cinder-base/Dockerfile
diff --git a/docker/centos/binary/cinder-app/cinder-base/build b/docker/centos/binary/cinder/cinder-base/build
similarity index 100%
rename from docker/centos/binary/cinder-app/cinder-base/build
rename to docker/centos/binary/cinder/cinder-base/build
diff --git a/docker/centos/binary/cinder-app/cinder-data/Dockerfile b/docker/centos/binary/cinder/cinder-data/Dockerfile
similarity index 100%
rename from docker/centos/binary/cinder-app/cinder-data/Dockerfile
rename to docker/centos/binary/cinder/cinder-data/Dockerfile
diff --git a/docker/centos/binary/cinder-app/cinder-data/build b/docker/centos/binary/cinder/cinder-data/build
similarity index 100%
rename from docker/centos/binary/cinder-app/cinder-data/build
rename to docker/centos/binary/cinder/cinder-data/build
diff --git a/docker/centos/binary/cinder-app/cinder-scheduler/Dockerfile b/docker/centos/binary/cinder/cinder-scheduler/Dockerfile
similarity index 100%
rename from docker/centos/binary/cinder-app/cinder-scheduler/Dockerfile
rename to docker/centos/binary/cinder/cinder-scheduler/Dockerfile
diff --git a/docker/centos/binary/cinder-app/cinder-scheduler/build b/docker/centos/binary/cinder/cinder-scheduler/build
similarity index 100%
rename from docker/centos/binary/cinder-app/cinder-scheduler/build
rename to docker/centos/binary/cinder/cinder-scheduler/build
diff --git a/docker/centos/binary/cinder/cinder-scheduler/config-external.sh b/docker/centos/binary/cinder/cinder-scheduler/config-external.sh
new file mode 120000
index 0000000000..f6d26aba5b
--- /dev/null
+++ b/docker/centos/binary/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/binary/cinder/cinder-scheduler/start.sh b/docker/centos/binary/cinder/cinder-scheduler/start.sh
new file mode 120000
index 0000000000..0953c6457f
--- /dev/null
+++ b/docker/centos/binary/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/binary/cinder-app/cinder-volume/Dockerfile b/docker/centos/binary/cinder/cinder-volume/Dockerfile
similarity index 100%
rename from docker/centos/binary/cinder-app/cinder-volume/Dockerfile
rename to docker/centos/binary/cinder/cinder-volume/Dockerfile
diff --git a/docker/centos/binary/cinder-app/cinder-volume/build b/docker/centos/binary/cinder/cinder-volume/build
similarity index 100%
rename from docker/centos/binary/cinder-app/cinder-volume/build
rename to docker/centos/binary/cinder/cinder-volume/build
diff --git a/docker/centos/binary/cinder/cinder-volume/config-external.sh b/docker/centos/binary/cinder/cinder-volume/config-external.sh
new file mode 120000
index 0000000000..abcdd6bc48
--- /dev/null
+++ b/docker/centos/binary/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/binary/cinder/cinder-volume/start.sh b/docker/centos/binary/cinder/cinder-volume/start.sh
new file mode 120000
index 0000000000..471a5ebd7c
--- /dev/null
+++ b/docker/centos/binary/cinder/cinder-volume/start.sh
@@ -0,0 +1 @@
+../../../../common/cinder/cinder-volume/start.sh
\ 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 829110b458..0000000000
--- 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 5b577f2903..0000000000
--- 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 33182c78cf..0000000000
--- 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/config-external.sh b/docker/centos/source/cinder-app/cinder-backup/config-external.sh
deleted file mode 120000
index c80c21a204..0000000000
--- 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 c21a17f09a..0000000000
--- 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-scheduler/config-external.sh b/docker/centos/source/cinder-app/cinder-scheduler/config-external.sh
deleted file mode 120000
index 9762490029..0000000000
--- 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 a91c95ebda..0000000000
--- 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/config-external.sh b/docker/centos/source/cinder-app/cinder-volume/config-external.sh
deleted file mode 120000
index 1f6476f2eb..0000000000
--- 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 f79df7c470..0000000000
--- 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-app/cinder-api/Dockerfile b/docker/centos/source/cinder/cinder-api/Dockerfile
similarity index 100%
rename from docker/centos/source/cinder-app/cinder-api/Dockerfile
rename to docker/centos/source/cinder/cinder-api/Dockerfile
diff --git a/docker/centos/source/cinder-app/cinder-api/build b/docker/centos/source/cinder/cinder-api/build
similarity index 100%
rename from docker/centos/source/cinder-app/cinder-api/build
rename to docker/centos/source/cinder/cinder-api/build
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 0000000000..50260e7b15
--- /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 0000000000..0e9409e986
--- /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 0000000000..4b6c5f104a
--- /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-app/cinder-backup/Dockerfile b/docker/centos/source/cinder/cinder-backup/Dockerfile
similarity index 100%
rename from docker/centos/source/cinder-app/cinder-backup/Dockerfile
rename to docker/centos/source/cinder/cinder-backup/Dockerfile
diff --git a/docker/centos/source/cinder-app/cinder-backup/build b/docker/centos/source/cinder/cinder-backup/build
similarity index 100%
rename from docker/centos/source/cinder-app/cinder-backup/build
rename to docker/centos/source/cinder/cinder-backup/build
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 0000000000..4c6f65d405
--- /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 0000000000..62ae41b035
--- /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-app/cinder-base/.buildinfo b/docker/centos/source/cinder/cinder-base/.buildinfo
similarity index 100%
rename from docker/centos/source/cinder-app/cinder-base/.buildinfo
rename to docker/centos/source/cinder/cinder-base/.buildinfo
diff --git a/docker/centos/source/cinder-app/cinder-base/Dockerfile b/docker/centos/source/cinder/cinder-base/Dockerfile
similarity index 100%
rename from docker/centos/source/cinder-app/cinder-base/Dockerfile
rename to docker/centos/source/cinder/cinder-base/Dockerfile
diff --git a/docker/centos/source/cinder-app/cinder-base/build b/docker/centos/source/cinder/cinder-base/build
similarity index 100%
rename from docker/centos/source/cinder-app/cinder-base/build
rename to docker/centos/source/cinder/cinder-base/build
diff --git a/docker/centos/source/cinder-app/cinder-data/Dockerfile b/docker/centos/source/cinder/cinder-data/Dockerfile
similarity index 100%
rename from docker/centos/source/cinder-app/cinder-data/Dockerfile
rename to docker/centos/source/cinder/cinder-data/Dockerfile
diff --git a/docker/centos/source/cinder-app/cinder-data/build b/docker/centos/source/cinder/cinder-data/build
similarity index 100%
rename from docker/centos/source/cinder-app/cinder-data/build
rename to docker/centos/source/cinder/cinder-data/build
diff --git a/docker/centos/source/cinder-app/cinder-scheduler/Dockerfile b/docker/centos/source/cinder/cinder-scheduler/Dockerfile
similarity index 100%
rename from docker/centos/source/cinder-app/cinder-scheduler/Dockerfile
rename to docker/centos/source/cinder/cinder-scheduler/Dockerfile
diff --git a/docker/centos/source/cinder-app/cinder-scheduler/build b/docker/centos/source/cinder/cinder-scheduler/build
similarity index 100%
rename from docker/centos/source/cinder-app/cinder-scheduler/build
rename to docker/centos/source/cinder/cinder-scheduler/build
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 0000000000..f6d26aba5b
--- /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 0000000000..0953c6457f
--- /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-app/cinder-volume/Dockerfile b/docker/centos/source/cinder/cinder-volume/Dockerfile
similarity index 100%
rename from docker/centos/source/cinder-app/cinder-volume/Dockerfile
rename to docker/centos/source/cinder/cinder-volume/Dockerfile
diff --git a/docker/centos/source/cinder-app/cinder-volume/build b/docker/centos/source/cinder/cinder-volume/build
similarity index 100%
rename from docker/centos/source/cinder-app/cinder-volume/build
rename to docker/centos/source/cinder/cinder-volume/build
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 0000000000..abcdd6bc48
--- /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 0000000000..471a5ebd7c
--- /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
diff --git a/docker/common/cinder-app/cinder-api/check.sh b/docker/common/cinder/cinder-api/check.sh
similarity index 100%
rename from docker/common/cinder-app/cinder-api/check.sh
rename to docker/common/cinder/cinder-api/check.sh
diff --git a/docker/common/cinder-app/cinder-api/config-external.sh b/docker/common/cinder/cinder-api/config-external.sh
similarity index 100%
rename from docker/common/cinder-app/cinder-api/config-external.sh
rename to docker/common/cinder/cinder-api/config-external.sh
diff --git a/docker/common/cinder-app/cinder-api/start.sh b/docker/common/cinder/cinder-api/start.sh
similarity index 100%
rename from docker/common/cinder-app/cinder-api/start.sh
rename to docker/common/cinder/cinder-api/start.sh
diff --git a/docker/common/cinder-app/cinder-backup/config-external.sh b/docker/common/cinder/cinder-backup/config-external.sh
similarity index 100%
rename from docker/common/cinder-app/cinder-backup/config-external.sh
rename to docker/common/cinder/cinder-backup/config-external.sh
diff --git a/docker/common/cinder-app/cinder-backup/start.sh b/docker/common/cinder/cinder-backup/start.sh
similarity index 100%
rename from docker/common/cinder-app/cinder-backup/start.sh
rename to docker/common/cinder/cinder-backup/start.sh
diff --git a/docker/common/cinder-app/cinder-scheduler/config-external.sh b/docker/common/cinder/cinder-scheduler/config-external.sh
similarity index 100%
rename from docker/common/cinder-app/cinder-scheduler/config-external.sh
rename to docker/common/cinder/cinder-scheduler/config-external.sh
diff --git a/docker/common/cinder-app/cinder-scheduler/start.sh b/docker/common/cinder/cinder-scheduler/start.sh
similarity index 100%
rename from docker/common/cinder-app/cinder-scheduler/start.sh
rename to docker/common/cinder/cinder-scheduler/start.sh
diff --git a/docker/common/cinder-app/cinder-volume/config-external.sh b/docker/common/cinder/cinder-volume/config-external.sh
similarity index 100%
rename from docker/common/cinder-app/cinder-volume/config-external.sh
rename to docker/common/cinder/cinder-volume/config-external.sh
diff --git a/docker/common/cinder-app/cinder-volume/start.sh b/docker/common/cinder/cinder-volume/start.sh
similarity index 100%
rename from docker/common/cinder-app/cinder-volume/start.sh
rename to docker/common/cinder/cinder-volume/start.sh
diff --git a/docker/fedora/binary/cinder-app b/docker/fedora/binary/cinder-app
deleted file mode 120000
index 238c3dc507..0000000000
--- a/docker/fedora/binary/cinder-app
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/cinder-app
\ No newline at end of file
diff --git a/docker/fedora/source/cinder-app b/docker/fedora/source/cinder-app
deleted file mode 120000
index 1741cc6c4a..0000000000
--- a/docker/fedora/source/cinder-app
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/source/cinder-app
\ No newline at end of file
diff --git a/docker/rhel/binary/cinder-app b/docker/rhel/binary/cinder-app
deleted file mode 120000
index 238c3dc507..0000000000
--- a/docker/rhel/binary/cinder-app
+++ /dev/null
@@ -1 +0,0 @@
-../../centos/binary/cinder-app
\ No newline at end of file