aboutsummaryrefslogtreecommitdiff
path: root/docker/centos/binary/nova/nova-compute
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-09 17:14:24 +0000
committerGerrit Code Review <review@openstack.org>2015-08-09 17:14:24 +0000
commita1a3b55a06ac6effa94563b10b5adf5950392df2 (patch)
tree3a9308df1afdf015db8c8a7635299bf4236ce708 /docker/centos/binary/nova/nova-compute
parentbb03d5f6bffa1d6f8195d7a1b0561c2026c95963 (diff)
parentd6cdd9da20ca3337af9ec7bc3abc04221627c236 (diff)
downloadkolla-a1a3b55a06ac6effa94563b10b5adf5950392df2.tar.gz
kolla-a1a3b55a06ac6effa94563b10b5adf5950392df2.zip
Merge "Remove config-internal for nova"
Diffstat (limited to 'docker/centos/binary/nova/nova-compute')
-rw-r--r--docker/centos/binary/nova/nova-compute/Dockerfile7
l---------docker/centos/binary/nova/nova-compute/config-internal.sh1
l---------docker/centos/binary/nova/nova-compute/config-nova-compute.sh1
3 files changed, 2 insertions, 7 deletions
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