diff options
| author | Swapnil Kulkarni <me@coolsvap.net> | 2015-07-15 10:32:21 +0000 |
|---|---|---|
| committer | Swapnil Kulkarni <me@coolsvap.net> | 2015-07-16 11:37:40 +0000 |
| commit | 51b7915ae8094fe149ff1752be01d6ff29fed15e (patch) | |
| tree | d96b1ee8b7898f7ea22006990cc8f2a9572aa45e /docker/centos/binary/nova-compute | |
| parent | 5c8561b1d71cf9d20dc533a1cf369cd9dbaeadb5 (diff) | |
| download | kolla-51b7915ae8094fe149ff1752be01d6ff29fed15e.tar.gz kolla-51b7915ae8094fe149ff1752be01d6ff29fed15e.zip | |
Updated directory structure to make it consistent
Closes-Bug: #1474774
Change-Id: Id61d777a8b741c800e0d034e3ee889c11bcf5fbc
Diffstat (limited to 'docker/centos/binary/nova-compute')
19 files changed, 0 insertions, 70 deletions
diff --git a/docker/centos/binary/nova-compute/nova-compute-data/Dockerfile b/docker/centos/binary/nova-compute/nova-compute-data/Dockerfile deleted file mode 100644 index 0af407095..000000000 --- a/docker/centos/binary/nova-compute/nova-compute-data/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -VOLUME [ "/var/lib/nova" ] -VOLUME [ "/var/lib/libvirt" ] -VOLUME [ "/etc/libvirt/qemu" ] - -# Command needed to start the data container. -# Note: data containers do not need to be persistent. -CMD ["/bin/true"] diff --git a/docker/centos/binary/nova-compute/nova-compute-data/build b/docker/centos/binary/nova-compute/nova-compute-data/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova-compute/nova-compute-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-compute/Dockerfile b/docker/centos/binary/nova-compute/nova-compute/Dockerfile deleted file mode 100644 index 6cdd27fbe..000000000 --- a/docker/centos/binary/nova-compute/nova-compute/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-nova-compute \ - 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/ - -VOLUME [ "/sys/fs/cgroup" ] - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova-compute/nova-compute/build b/docker/centos/binary/nova-compute/nova-compute/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova-compute/nova-compute/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-compute/config-external.sh b/docker/centos/binary/nova-compute/nova-compute/config-external.sh deleted file mode 120000 index 46de4bf33..000000000 --- a/docker/centos/binary/nova-compute/nova-compute/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova-compute/nova-compute/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-compute/config-internal.sh b/docker/centos/binary/nova-compute/nova-compute/config-internal.sh deleted file mode 120000 index 58337d966..000000000 --- a/docker/centos/binary/nova-compute/nova-compute/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova-compute/nova-compute/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-compute/config-nova-compute.sh b/docker/centos/binary/nova-compute/nova-compute/config-nova-compute.sh deleted file mode 120000 index 0f3c1216c..000000000 --- a/docker/centos/binary/nova-compute/nova-compute/config-nova-compute.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova-compute/nova-compute/config-nova-compute.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-compute/start.sh b/docker/centos/binary/nova-compute/nova-compute/start.sh deleted file mode 120000 index ef5d32f18..000000000 --- a/docker/centos/binary/nova-compute/nova-compute/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova-compute/nova-compute/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-libvirt/Dockerfile b/docker/centos/binary/nova-compute/nova-libvirt/Dockerfile deleted file mode 100644 index fd4829575..000000000 --- a/docker/centos/binary/nova-compute/nova-libvirt/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install libvirt-daemon \ - libguestfs \ - qemu-system-x86 \ - libvirt-daemon-driver-nwfilter \ - libvirt-daemon-config-nwfilter \ - libvirt-daemon-driver-lxc \ - && yum clean all - -VOLUME [ "/sys/fs/cgroup" ] - -COPY ./start.sh /start.sh - -COPY config-internal.sh config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova-compute/nova-libvirt/build b/docker/centos/binary/nova-compute/nova-libvirt/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova-compute/nova-libvirt/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-libvirt/config-external.sh b/docker/centos/binary/nova-compute/nova-libvirt/config-external.sh deleted file mode 120000 index 22275236b..000000000 --- a/docker/centos/binary/nova-compute/nova-libvirt/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova-compute/nova-libvirt/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-libvirt/config-internal.sh b/docker/centos/binary/nova-compute/nova-libvirt/config-internal.sh deleted file mode 120000 index c20242db7..000000000 --- a/docker/centos/binary/nova-compute/nova-libvirt/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova-compute/nova-libvirt/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-libvirt/start.sh b/docker/centos/binary/nova-compute/nova-libvirt/start.sh deleted file mode 120000 index eac909978..000000000 --- a/docker/centos/binary/nova-compute/nova-libvirt/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova-compute/nova-libvirt/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-network/Dockerfile b/docker/centos/binary/nova-compute/nova-network/Dockerfile deleted file mode 100644 index 70ccc3ad9..000000000 --- a/docker/centos/binary/nova-compute/nova-network/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -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/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova-compute/nova-network/build b/docker/centos/binary/nova-compute/nova-network/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova-compute/nova-network/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-network/config-external.sh b/docker/centos/binary/nova-compute/nova-network/config-external.sh deleted file mode 120000 index 1257cd898..000000000 --- a/docker/centos/binary/nova-compute/nova-network/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova-compute/nova-network/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-network/config-internal.sh b/docker/centos/binary/nova-compute/nova-network/config-internal.sh deleted file mode 120000 index 3b64fcabc..000000000 --- a/docker/centos/binary/nova-compute/nova-network/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova-compute/nova-network/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-network/config-nova-network.sh b/docker/centos/binary/nova-compute/nova-network/config-nova-network.sh deleted file mode 120000 index ed1af588e..000000000 --- a/docker/centos/binary/nova-compute/nova-network/config-nova-network.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova-compute/nova-network/config-nova-network.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova-compute/nova-network/start.sh b/docker/centos/binary/nova-compute/nova-network/start.sh deleted file mode 120000 index f2bec1979..000000000 --- a/docker/centos/binary/nova-compute/nova-network/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova-compute/nova-network/start.sh
\ No newline at end of file |
