Merge "Add config-internal/config-external to Nova-controller containers"

15 files changed, 22 insertions, 0 deletions

diff --git a/docker/centos/binary/nova-controller/nova-api/Dockerfile b/docker/centos/binary/nova-controller/nova-api/Dockerfile
index 7abd32087..fb0581dce 100644
--- a/docker/centos/binary/nova-controller/nova-api/Dockerfile
+++ b/docker/centos/binary/nova-controller/nova-api/Dockerfile
@@ -7,4 +7,6 @@ RUN yum -y install \
 ADD ./start.sh /start.sh
 ADD ./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/config-external.sh b/docker/centos/binary/nova-controller/nova-api/config-external.sh
new file mode 120000
index 000000000..a2a68471d
--- /dev/null
+++ b/docker/centos/binary/nova-controller/nova-api/config-external.sh
@@ -0,0 +1 @@
+../../../../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
new file mode 120000
index 000000000..cde9e2645
--- /dev/null
+++ b/docker/centos/binary/nova-controller/nova-api/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova-controller/nova-api/config-internal.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
index f91113bad..0f4b104b8 100644
--- a/docker/centos/binary/nova-controller/nova-conductor/Dockerfile
+++ b/docker/centos/binary/nova-controller/nova-conductor/Dockerfile
@@ -5,4 +5,7 @@ RUN yum -y install \
         openstack-nova-conductor && yum clean all
 
 ADD ./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/config-external.sh b/docker/centos/binary/nova-controller/nova-conductor/config-external.sh
new file mode 120000
index 000000000..4cb26e83e
--- /dev/null
+++ b/docker/centos/binary/nova-controller/nova-conductor/config-external.sh
@@ -0,0 +1 @@
+../../../../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
new file mode 120000
index 000000000..836b54436
--- /dev/null
+++ b/docker/centos/binary/nova-controller/nova-conductor/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova-controller/nova-conductor/config-internal.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
index 576c91b5a..51331353c 100644
--- a/docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile
+++ b/docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile
@@ -5,4 +5,6 @@ RUN yum -y install openstack-nova-console && yum clean all
 
 ADD 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/config-external.sh b/docker/centos/binary/nova-controller/nova-consoleauth/config-external.sh
new file mode 120000
index 000000000..78785fe3e
--- /dev/null
+++ b/docker/centos/binary/nova-controller/nova-consoleauth/config-external.sh
@@ -0,0 +1 @@
+../../../../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
new file mode 120000
index 000000000..07b75b62d
--- /dev/null
+++ b/docker/centos/binary/nova-controller/nova-consoleauth/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova-controller/nova-consoleauth/config-internal.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
index 682625853..3fb1d31ad 100644
--- a/docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile
+++ b/docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile
@@ -7,4 +7,6 @@ RUN yum -y install \
 
 ADD 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/config-external.sh b/docker/centos/binary/nova-controller/nova-novncproxy/config-external.sh
new file mode 120000
index 000000000..8755ef455
--- /dev/null
+++ b/docker/centos/binary/nova-controller/nova-novncproxy/config-external.sh
@@ -0,0 +1 @@
+../../../../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
new file mode 120000
index 000000000..ddfde0832
--- /dev/null
+++ b/docker/centos/binary/nova-controller/nova-novncproxy/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova-controller/nova-novncproxy/config-internal.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
index 2eec47554..49f34f66b 100644
--- a/docker/centos/binary/nova-controller/nova-scheduler/Dockerfile
+++ b/docker/centos/binary/nova-controller/nova-scheduler/Dockerfile
@@ -5,4 +5,7 @@ RUN yum -y install \
         openstack-nova-scheduler && yum clean all
 
 ADD ./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/config-external.sh b/docker/centos/binary/nova-controller/nova-scheduler/config-external.sh
new file mode 120000
index 000000000..502d246b0
--- /dev/null
+++ b/docker/centos/binary/nova-controller/nova-scheduler/config-external.sh
@@ -0,0 +1 @@
+../../../../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
new file mode 120000
index 000000000..4b4808a79
--- /dev/null
+++ b/docker/centos/binary/nova-controller/nova-scheduler/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova-controller/nova-scheduler/config-internal.sh
\ No newline at end of file