Remove config-internal for nova

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

21 files changed, 16 insertions, 38 deletions

diff --git a/docker/centos/binary/nova/nova-api/Dockerfile b/docker/centos/binary/nova/nova-api/Dockerfile
index 4e20a5036..751e574c3 100644
--- a/docker/centos/binary/nova/nova-api/Dockerfile
+++ b/docker/centos/binary/nova/nova-api/Dockerfile
@@ -4,9 +4,7 @@ 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/
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/nova/nova-api/check.sh b/docker/centos/binary/nova/nova-api/check.sh
deleted file mode 120000
index 980c32476..000000000
--- a/docker/centos/binary/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/binary/nova/nova-api/config-internal.sh b/docker/centos/binary/nova/nova-api/config-internal.sh
deleted file mode 120000
index 7a2866993..000000000
--- a/docker/centos/binary/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/binary/nova/nova-base/Dockerfile b/docker/centos/binary/nova/nova-base/Dockerfile
index 95220cfd8..ea56129b8 100644
--- a/docker/centos/binary/nova/nova-base/Dockerfile
+++ b/docker/centos/binary/nova/nova-base/Dockerfile
@@ -6,6 +6,3 @@ RUN yum -y install openstack-nova-common \
      python-cinderclient \
      python-nova \
      bridge-utils && yum clean all
-
-COPY config-nova.sh /opt/kolla/config-nova.sh
-
diff --git a/docker/centos/binary/nova/nova-base/config-nova.sh b/docker/centos/binary/nova/nova-base/config-nova.sh
deleted file mode 120000
index c27bef695..000000000
--- a/docker/centos/binary/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/binary/nova/nova-compute/Dockerfile b/docker/centos/binary/nova/nova-compute/Dockerfile
index 754704ba5..495e66b84 100644
--- a/docker/centos/binary/nova/nova-compute/Dockerfile
+++ b/docker/centos/binary/nova/nova-compute/Dockerfile
@@ -5,11 +5,8 @@ RUN yum -y install openstack-nova-compute \
         openvswitch \
         sysfsutils && yum clean all
 
-COPY config-nova-compute.sh /opt/kolla/config-nova-compute.sh
-
-COPY ./start.sh /start.sh
-
-COPY 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/binary/nova/nova-compute/config-internal.sh b/docker/centos/binary/nova/nova-compute/config-internal.sh
deleted file mode 120000
index 8d7449dc7..000000000
--- a/docker/centos/binary/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/binary/nova/nova-compute/config-nova-compute.sh b/docker/centos/binary/nova/nova-compute/config-nova-compute.sh
deleted file mode 120000
index f003ee0fc..000000000
--- a/docker/centos/binary/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/binary/nova/nova-conductor/Dockerfile b/docker/centos/binary/nova/nova-conductor/Dockerfile
index 1e20095d8..b29362dc0 100644
--- a/docker/centos/binary/nova/nova-conductor/Dockerfile
+++ b/docker/centos/binary/nova/nova-conductor/Dockerfile
@@ -4,8 +4,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 RUN yum -y install \
         openstack-nova-conductor && 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/binary/nova/nova-conductor/config-internal.sh b/docker/centos/binary/nova/nova-conductor/config-internal.sh
deleted file mode 120000
index f0ba78856..000000000
--- a/docker/centos/binary/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/binary/nova/nova-consoleauth/Dockerfile b/docker/centos/binary/nova/nova-consoleauth/Dockerfile
index 4291e3310..48c5a866c 100644
--- a/docker/centos/binary/nova/nova-consoleauth/Dockerfile
+++ b/docker/centos/binary/nova/nova-consoleauth/Dockerfile
@@ -3,8 +3,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN yum -y install openstack-nova-console && 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/binary/nova/nova-consoleauth/config-internal.sh b/docker/centos/binary/nova/nova-consoleauth/config-internal.sh
deleted file mode 120000
index d166c7012..000000000
--- a/docker/centos/binary/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/binary/nova/nova-libvirt/Dockerfile b/docker/centos/binary/nova/nova-libvirt/Dockerfile
index fd4829575..856cab73e 100644
--- a/docker/centos/binary/nova/nova-libvirt/Dockerfile
+++ b/docker/centos/binary/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/binary/nova/nova-libvirt/config-internal.sh b/docker/centos/binary/nova/nova-libvirt/config-internal.sh
deleted file mode 120000
index fbf3f4c4e..000000000
--- a/docker/centos/binary/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/binary/nova/nova-network/Dockerfile b/docker/centos/binary/nova/nova-network/Dockerfile
index 70ccc3ad9..86cb3ccf8 100644
--- a/docker/centos/binary/nova/nova-network/Dockerfile
+++ b/docker/centos/binary/nova/nova-network/Dockerfile
@@ -4,9 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 RUN yum -y install openstack-nova-network \
         bridge-utils initscripts && yum clean all
 
-COPY config-nova-network.sh /opt/kolla/config-nova-network.sh
-COPY ./start.sh /start.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/binary/nova/nova-network/config-internal.sh b/docker/centos/binary/nova/nova-network/config-internal.sh
deleted file mode 120000
index b7112e39d..000000000
--- a/docker/centos/binary/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/binary/nova/nova-network/config-nova-network.sh b/docker/centos/binary/nova/nova-network/config-nova-network.sh
deleted file mode 120000
index 0908005d2..000000000
--- a/docker/centos/binary/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/binary/nova/nova-novncproxy/Dockerfile b/docker/centos/binary/nova/nova-novncproxy/Dockerfile
index 5b7a4bb70..9ca170a88 100644
--- a/docker/centos/binary/nova/nova-novncproxy/Dockerfile
+++ b/docker/centos/binary/nova/nova-novncproxy/Dockerfile
@@ -5,8 +5,8 @@ RUN yum -y install \
     novnc openstack-nova-novncproxy && \
     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/binary/nova/nova-novncproxy/config-internal.sh b/docker/centos/binary/nova/nova-novncproxy/config-internal.sh
deleted file mode 120000
index d6e4e45ec..000000000
--- a/docker/centos/binary/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/binary/nova/nova-scheduler/Dockerfile b/docker/centos/binary/nova/nova-scheduler/Dockerfile
index 0359a87c5..db7c11769 100644
--- a/docker/centos/binary/nova/nova-scheduler/Dockerfile
+++ b/docker/centos/binary/nova/nova-scheduler/Dockerfile
@@ -4,8 +4,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 RUN yum -y install \
         openstack-nova-scheduler && 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/binary/nova/nova-scheduler/config-internal.sh b/docker/centos/binary/nova/nova-scheduler/config-internal.sh
deleted file mode 120000
index 1752f44a7..000000000
--- a/docker/centos/binary/nova/nova-scheduler/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/nova/nova-scheduler/config-internal.sh
\ No newline at end of file