Updated directory structure to make it consistent

Closes-Bug: #1474774
Change-Id: Id61d777a8b741c800e0d034e3ee889c11bcf5fbc

26 files changed, 0 insertions, 77 deletions

diff --git a/docker/centos/binary/nova-controller/nova-api/Dockerfile b/docker/centos/binary/nova-controller/nova-api/Dockerfile
deleted file mode 100644
index 4e20a5036..000000000
--- a/docker/centos/binary/nova-controller/nova-api/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        openstack-nova-api && yum clean all
-
-COPY ./start.sh /start.sh
-COPY ./check.sh /check.sh
-
-COPY config-internal.sh config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/nova-controller/nova-api/build b/docker/centos/binary/nova-controller/nova-api/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/nova-controller/nova-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-api/check.sh b/docker/centos/binary/nova-controller/nova-api/check.sh
deleted file mode 120000
index 2a047038e..000000000
--- a/docker/centos/binary/nova-controller/nova-api/check.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-api/check.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-api/config-external.sh b/docker/centos/binary/nova-controller/nova-api/config-external.sh
deleted file mode 120000
index a2a68471d..000000000
--- a/docker/centos/binary/nova-controller/nova-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-api/config-internal.sh b/docker/centos/binary/nova-controller/nova-api/config-internal.sh
deleted file mode 120000
index cde9e2645..000000000
--- a/docker/centos/binary/nova-controller/nova-api/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-api/start.sh b/docker/centos/binary/nova-controller/nova-api/start.sh
deleted file mode 120000
index 7613d713a..000000000
--- a/docker/centos/binary/nova-controller/nova-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-conductor/Dockerfile b/docker/centos/binary/nova-controller/nova-conductor/Dockerfile
deleted file mode 100644
index 1e20095d8..000000000
--- a/docker/centos/binary/nova-controller/nova-conductor/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        openstack-nova-conductor && yum clean all
-
-COPY ./start.sh /start.sh
-
-COPY config-internal.sh config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/nova-controller/nova-conductor/build b/docker/centos/binary/nova-controller/nova-conductor/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/nova-controller/nova-conductor/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-conductor/config-external.sh b/docker/centos/binary/nova-controller/nova-conductor/config-external.sh
deleted file mode 120000
index 4cb26e83e..000000000
--- a/docker/centos/binary/nova-controller/nova-conductor/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-conductor/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-conductor/config-internal.sh b/docker/centos/binary/nova-controller/nova-conductor/config-internal.sh
deleted file mode 120000
index 836b54436..000000000
--- a/docker/centos/binary/nova-controller/nova-conductor/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-conductor/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-conductor/start.sh b/docker/centos/binary/nova-controller/nova-conductor/start.sh
deleted file mode 120000
index 2b0dc28f8..000000000
--- a/docker/centos/binary/nova-controller/nova-conductor/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-conductor/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile b/docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile
deleted file mode 100644
index 4291e3310..000000000
--- a/docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-nova-console && yum clean all
-
-COPY start.sh /start.sh
-
-COPY config-internal.sh config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/nova-controller/nova-consoleauth/build b/docker/centos/binary/nova-controller/nova-consoleauth/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/nova-controller/nova-consoleauth/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-consoleauth/config-external.sh b/docker/centos/binary/nova-controller/nova-consoleauth/config-external.sh
deleted file mode 120000
index 78785fe3e..000000000
--- a/docker/centos/binary/nova-controller/nova-consoleauth/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-consoleauth/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-consoleauth/config-internal.sh b/docker/centos/binary/nova-controller/nova-consoleauth/config-internal.sh
deleted file mode 120000
index 07b75b62d..000000000
--- a/docker/centos/binary/nova-controller/nova-consoleauth/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-consoleauth/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-consoleauth/start.sh b/docker/centos/binary/nova-controller/nova-consoleauth/start.sh
deleted file mode 120000
index 0821b3c38..000000000
--- a/docker/centos/binary/nova-controller/nova-consoleauth/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-consoleauth/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile b/docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile
deleted file mode 100644
index 5b7a4bb70..000000000
--- a/docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-    novnc openstack-nova-novncproxy && \
-    yum clean all
-
-COPY start.sh /start.sh
-
-COPY config-internal.sh config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/nova-controller/nova-novncproxy/build b/docker/centos/binary/nova-controller/nova-novncproxy/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/nova-controller/nova-novncproxy/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-novncproxy/config-external.sh b/docker/centos/binary/nova-controller/nova-novncproxy/config-external.sh
deleted file mode 120000
index 8755ef455..000000000
--- a/docker/centos/binary/nova-controller/nova-novncproxy/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-novncproxy/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-novncproxy/config-internal.sh b/docker/centos/binary/nova-controller/nova-novncproxy/config-internal.sh
deleted file mode 120000
index ddfde0832..000000000
--- a/docker/centos/binary/nova-controller/nova-novncproxy/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-novncproxy/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-novncproxy/start.sh b/docker/centos/binary/nova-controller/nova-novncproxy/start.sh
deleted file mode 120000
index 80b6459a4..000000000
--- a/docker/centos/binary/nova-controller/nova-novncproxy/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-novncproxy/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-scheduler/Dockerfile b/docker/centos/binary/nova-controller/nova-scheduler/Dockerfile
deleted file mode 100644
index 0359a87c5..000000000
--- a/docker/centos/binary/nova-controller/nova-scheduler/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        openstack-nova-scheduler && yum clean all
-
-COPY ./start.sh /start.sh
-
-COPY config-internal.sh config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/nova-controller/nova-scheduler/build b/docker/centos/binary/nova-controller/nova-scheduler/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/nova-controller/nova-scheduler/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-scheduler/config-external.sh b/docker/centos/binary/nova-controller/nova-scheduler/config-external.sh
deleted file mode 120000
index 502d246b0..000000000
--- a/docker/centos/binary/nova-controller/nova-scheduler/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-scheduler/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-scheduler/config-internal.sh b/docker/centos/binary/nova-controller/nova-scheduler/config-internal.sh
deleted file mode 120000
index 4b4808a79..000000000
--- a/docker/centos/binary/nova-controller/nova-scheduler/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-scheduler/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/nova-controller/nova-scheduler/start.sh b/docker/centos/binary/nova-controller/nova-scheduler/start.sh
deleted file mode 120000
index a72115139..000000000
--- a/docker/centos/binary/nova-controller/nova-scheduler/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova-controller/nova-scheduler/start.sh
\ No newline at end of file