diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:14:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:14:24 +0000 |
| commit | a1a3b55a06ac6effa94563b10b5adf5950392df2 (patch) | |
| tree | 3a9308df1afdf015db8c8a7635299bf4236ce708 /docker/centos/binary/nova/nova-libvirt | |
| parent | bb03d5f6bffa1d6f8195d7a1b0561c2026c95963 (diff) | |
| parent | d6cdd9da20ca3337af9ec7bc3abc04221627c236 (diff) | |
| download | kolla-a1a3b55a06ac6effa94563b10b5adf5950392df2.tar.gz kolla-a1a3b55a06ac6effa94563b10b5adf5950392df2.zip | |
Merge "Remove config-internal for nova"
Diffstat (limited to 'docker/centos/binary/nova/nova-libvirt')
| -rw-r--r-- | docker/centos/binary/nova/nova-libvirt/Dockerfile | 4 | ||||
| l--------- | docker/centos/binary/nova/nova-libvirt/config-internal.sh | 1 |
2 files changed, 2 insertions, 3 deletions
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 |