Remove config-internal for nova

Change-Id: I7dec09e46232f25fd396d1f2f4076f599833f5e5
Partially-implements: blueprint remove-config-internal

21 files changed, 16 insertions, 34 deletions

diff --git a/docker/centos/source/nova/nova-api/Dockerfile b/docker/centos/source/nova/nova-api/Dockerfile
index 1373c7b6d..02626c2c2 100644
--- a/docker/centos/source/nova/nova-api/Dockerfile
+++ b/docker/centos/source/nova/nova-api/Dockerfile
@@ -1,9 +1,7 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-ADD ./start.sh /start.sh
-ADD ./check.sh /check.sh
-
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-api/check.sh b/docker/centos/source/nova/nova-api/check.sh
deleted file mode 120000
index 980c32476..000000000
--- a/docker/centos/source/nova/nova-api/check.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-api/check.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-api/config-internal.sh b/docker/centos/source/nova/nova-api/config-internal.sh
deleted file mode 120000
index 7a2866993..000000000
--- a/docker/centos/source/nova/nova-api/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-base/Dockerfile b/docker/centos/source/nova/nova-base/Dockerfile
index f9aca91f0..b15dcd20c 100644
--- a/docker/centos/source/nova/nova-base/Dockerfile
+++ b/docker/centos/source/nova/nova-base/Dockerfile
@@ -22,5 +22,3 @@ RUN cd /nova \
     && cp -r /nova/etc/nova/* /etc/nova/ \
     && chown -R nova: /etc/nova /var/log/nova \
     && rm -rf /root/.cache
-
-COPY config-nova.sh /opt/kolla/config-nova.sh
diff --git a/docker/centos/source/nova/nova-base/config-nova.sh b/docker/centos/source/nova/nova-base/config-nova.sh
deleted file mode 120000
index c27bef695..000000000
--- a/docker/centos/source/nova/nova-base/config-nova.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-base/config-nova.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-compute/Dockerfile b/docker/centos/source/nova/nova-compute/Dockerfile
index 797764ae0..34fabe997 100644
--- a/docker/centos/source/nova/nova-compute/Dockerfile
+++ b/docker/centos/source/nova/nova-compute/Dockerfile
@@ -3,9 +3,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN yum -y install sysfsutils && yum clean all
 
-COPY ./start.sh /start.sh
-
-COPY config-nova-compute.sh config-internal.sh config-external.sh /opt/kolla/
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
 
 VOLUME [ "/sys/fs/cgroup" ]
 
diff --git a/docker/centos/source/nova/nova-compute/config-internal.sh b/docker/centos/source/nova/nova-compute/config-internal.sh
deleted file mode 120000
index 8d7449dc7..000000000
--- a/docker/centos/source/nova/nova-compute/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-compute/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-compute/config-nova-compute.sh b/docker/centos/source/nova/nova-compute/config-nova-compute.sh
deleted file mode 120000
index f003ee0fc..000000000
--- a/docker/centos/source/nova/nova-compute/config-nova-compute.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-compute/config-nova-compute.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-conductor/Dockerfile b/docker/centos/source/nova/nova-conductor/Dockerfile
index 2affea802..f22d5b243 100644
--- a/docker/centos/source/nova/nova-conductor/Dockerfile
+++ b/docker/centos/source/nova/nova-conductor/Dockerfile
@@ -1,8 +1,8 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-ADD ./start.sh /start.sh
+COPY start.sh /
 
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-conductor/config-internal.sh b/docker/centos/source/nova/nova-conductor/config-internal.sh
deleted file mode 120000
index f0ba78856..000000000
--- a/docker/centos/source/nova/nova-conductor/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-conductor/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-consoleauth/Dockerfile b/docker/centos/source/nova/nova-consoleauth/Dockerfile
index 689daed04..f22d5b243 100644
--- a/docker/centos/source/nova/nova-consoleauth/Dockerfile
+++ b/docker/centos/source/nova/nova-consoleauth/Dockerfile
@@ -1,8 +1,8 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-ADD start.sh /start.sh
+COPY start.sh /
 
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-consoleauth/config-internal.sh b/docker/centos/source/nova/nova-consoleauth/config-internal.sh
deleted file mode 120000
index d166c7012..000000000
--- a/docker/centos/source/nova/nova-consoleauth/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-consoleauth/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-libvirt/Dockerfile b/docker/centos/source/nova/nova-libvirt/Dockerfile
index fd4829575..856cab73e 100644
--- a/docker/centos/source/nova/nova-libvirt/Dockerfile
+++ b/docker/centos/source/nova/nova-libvirt/Dockerfile
@@ -11,8 +11,8 @@ RUN yum -y install libvirt-daemon \
 
 VOLUME [ "/sys/fs/cgroup" ]
 
-COPY ./start.sh /start.sh
+COPY start.sh /
 
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-libvirt/config-internal.sh b/docker/centos/source/nova/nova-libvirt/config-internal.sh
deleted file mode 120000
index fbf3f4c4e..000000000
--- a/docker/centos/source/nova/nova-libvirt/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-libvirt/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-network/Dockerfile b/docker/centos/source/nova/nova-network/Dockerfile
index faadbbe8c..c8822e917 100644
--- a/docker/centos/source/nova/nova-network/Dockerfile
+++ b/docker/centos/source/nova/nova-network/Dockerfile
@@ -3,8 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN yum -y install initscripts && yum clean all
 
-COPY ./start.sh /start.sh
-
-COPY config-nova-network.sh config-internal.sh config-external.sh /opt/kolla/
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-network/config-internal.sh b/docker/centos/source/nova/nova-network/config-internal.sh
deleted file mode 120000
index b7112e39d..000000000
--- a/docker/centos/source/nova/nova-network/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-network/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-network/config-nova-network.sh b/docker/centos/source/nova/nova-network/config-nova-network.sh
deleted file mode 120000
index 0908005d2..000000000
--- a/docker/centos/source/nova/nova-network/config-nova-network.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-network/config-nova-network.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-novncproxy/Dockerfile b/docker/centos/source/nova/nova-novncproxy/Dockerfile
index 14cbf7059..69c99cdf7 100644
--- a/docker/centos/source/nova/nova-novncproxy/Dockerfile
+++ b/docker/centos/source/nova/nova-novncproxy/Dockerfile
@@ -6,8 +6,8 @@ RUN yum -y install \
         novnc \
     && yum clean all
 
-COPY start.sh /start.sh
+COPY start.sh /
 
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-novncproxy/config-internal.sh b/docker/centos/source/nova/nova-novncproxy/config-internal.sh
deleted file mode 120000
index d6e4e45ec..000000000
--- a/docker/centos/source/nova/nova-novncproxy/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-novncproxy/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-scheduler/Dockerfile b/docker/centos/source/nova/nova-scheduler/Dockerfile
index 89051a371..f22d5b243 100644
--- a/docker/centos/source/nova/nova-scheduler/Dockerfile
+++ b/docker/centos/source/nova/nova-scheduler/Dockerfile
@@ -1,8 +1,8 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-COPY ./start.sh /start.sh
+COPY start.sh /
 
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-scheduler/config-internal.sh b/docker/centos/source/nova/nova-scheduler/config-internal.sh
deleted file mode 120000
index 1752f44a7..000000000
--- a/docker/centos/source/nova/nova-scheduler/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-scheduler/config-internal.sh
\ No newline at end of file