From f895ee07cc5c1030e32854cf9a4e91bbeaf4de12 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Thu, 27 Aug 2015 19:23:49 -0700 Subject: Remove docker directory Remove the docker directory (yay) and old build tools. This will result in an f21 failing gate - however, I have a patch submission to remove that gate from our project configuration. Change-Id: I3c461cedb6906422c8076f60c470e773d6cdcf33 Partially-Implements: blueprint remove-docker-dir --- docker/centos/binary/nova/nova-api/Dockerfile | 10 ---------- docker/centos/binary/nova/nova-api/build | 1 - docker/centos/binary/nova/nova-api/config-external.sh | 1 - docker/centos/binary/nova/nova-api/start.sh | 1 - docker/centos/binary/nova/nova-base/Dockerfile | 8 -------- docker/centos/binary/nova/nova-base/build | 1 - docker/centos/binary/nova/nova-compute/Dockerfile | 13 ------------- docker/centos/binary/nova/nova-compute/build | 1 - .../centos/binary/nova/nova-compute/config-external.sh | 1 - docker/centos/binary/nova/nova-compute/start.sh | 1 - docker/centos/binary/nova/nova-conductor/Dockerfile | 11 ----------- docker/centos/binary/nova/nova-conductor/build | 1 - .../binary/nova/nova-conductor/config-external.sh | 1 - docker/centos/binary/nova/nova-conductor/start.sh | 1 - docker/centos/binary/nova/nova-consoleauth/Dockerfile | 10 ---------- docker/centos/binary/nova/nova-consoleauth/build | 1 - .../binary/nova/nova-consoleauth/config-external.sh | 1 - docker/centos/binary/nova/nova-consoleauth/start.sh | 1 - docker/centos/binary/nova/nova-libvirt/Dockerfile | 18 ------------------ docker/centos/binary/nova/nova-libvirt/build | 1 - .../centos/binary/nova/nova-libvirt/config-external.sh | 1 - docker/centos/binary/nova/nova-libvirt/start.sh | 1 - docker/centos/binary/nova/nova-network/Dockerfile | 10 ---------- docker/centos/binary/nova/nova-network/build | 1 - .../centos/binary/nova/nova-network/config-external.sh | 1 - docker/centos/binary/nova/nova-network/start.sh | 1 - docker/centos/binary/nova/nova-novncproxy/Dockerfile | 12 ------------ docker/centos/binary/nova/nova-novncproxy/build | 1 - .../binary/nova/nova-novncproxy/config-external.sh | 1 - docker/centos/binary/nova/nova-novncproxy/start.sh | 1 - docker/centos/binary/nova/nova-scheduler/Dockerfile | 11 ----------- docker/centos/binary/nova/nova-scheduler/build | 1 - .../binary/nova/nova-scheduler/config-external.sh | 1 - docker/centos/binary/nova/nova-scheduler/start.sh | 1 - 34 files changed, 128 deletions(-) delete mode 100644 docker/centos/binary/nova/nova-api/Dockerfile delete mode 120000 docker/centos/binary/nova/nova-api/build delete mode 120000 docker/centos/binary/nova/nova-api/config-external.sh delete mode 120000 docker/centos/binary/nova/nova-api/start.sh delete mode 100644 docker/centos/binary/nova/nova-base/Dockerfile delete mode 120000 docker/centos/binary/nova/nova-base/build delete mode 100644 docker/centos/binary/nova/nova-compute/Dockerfile delete mode 120000 docker/centos/binary/nova/nova-compute/build delete mode 120000 docker/centos/binary/nova/nova-compute/config-external.sh delete mode 120000 docker/centos/binary/nova/nova-compute/start.sh delete mode 100644 docker/centos/binary/nova/nova-conductor/Dockerfile delete mode 120000 docker/centos/binary/nova/nova-conductor/build delete mode 120000 docker/centos/binary/nova/nova-conductor/config-external.sh delete mode 120000 docker/centos/binary/nova/nova-conductor/start.sh delete mode 100644 docker/centos/binary/nova/nova-consoleauth/Dockerfile delete mode 120000 docker/centos/binary/nova/nova-consoleauth/build delete mode 120000 docker/centos/binary/nova/nova-consoleauth/config-external.sh delete mode 120000 docker/centos/binary/nova/nova-consoleauth/start.sh delete mode 100644 docker/centos/binary/nova/nova-libvirt/Dockerfile delete mode 120000 docker/centos/binary/nova/nova-libvirt/build delete mode 120000 docker/centos/binary/nova/nova-libvirt/config-external.sh delete mode 120000 docker/centos/binary/nova/nova-libvirt/start.sh delete mode 100644 docker/centos/binary/nova/nova-network/Dockerfile delete mode 120000 docker/centos/binary/nova/nova-network/build delete mode 120000 docker/centos/binary/nova/nova-network/config-external.sh delete mode 120000 docker/centos/binary/nova/nova-network/start.sh delete mode 100644 docker/centos/binary/nova/nova-novncproxy/Dockerfile delete mode 120000 docker/centos/binary/nova/nova-novncproxy/build delete mode 120000 docker/centos/binary/nova/nova-novncproxy/config-external.sh delete mode 120000 docker/centos/binary/nova/nova-novncproxy/start.sh delete mode 100644 docker/centos/binary/nova/nova-scheduler/Dockerfile delete mode 120000 docker/centos/binary/nova/nova-scheduler/build delete mode 120000 docker/centos/binary/nova/nova-scheduler/config-external.sh delete mode 120000 docker/centos/binary/nova/nova-scheduler/start.sh (limited to 'docker/centos/binary/nova') diff --git a/docker/centos/binary/nova/nova-api/Dockerfile b/docker/centos/binary/nova/nova-api/Dockerfile deleted file mode 100644 index 751e574c3..000000000 --- a/docker/centos/binary/nova/nova-api/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - openstack-nova-api && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-api/build b/docker/centos/binary/nova/nova-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/nova/nova-api/config-external.sh b/docker/centos/binary/nova/nova-api/config-external.sh deleted file mode 120000 index fa9d355fe..000000000 --- a/docker/centos/binary/nova/nova-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-api/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/nova/nova-api/start.sh b/docker/centos/binary/nova/nova-api/start.sh deleted file mode 120000 index 12fd6f028..000000000 --- a/docker/centos/binary/nova/nova-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-api/start.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 deleted file mode 100644 index ea56129b8..000000000 --- a/docker/centos/binary/nova/nova-base/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-nova-common \ - python-keystoneclient \ - python-cinderclient \ - python-nova \ - bridge-utils && yum clean all diff --git a/docker/centos/binary/nova/nova-base/build b/docker/centos/binary/nova/nova-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/nova/nova-compute/Dockerfile b/docker/centos/binary/nova/nova-compute/Dockerfile deleted file mode 100644 index 495e66b84..000000000 --- a/docker/centos/binary/nova/nova-compute/Dockerfile +++ /dev/null @@ -1,13 +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 \ - openvswitch \ - sysfsutils && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -VOLUME [ "/sys/fs/cgroup" ] - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-compute/build b/docker/centos/binary/nova/nova-compute/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/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/nova-compute/config-external.sh b/docker/centos/binary/nova/nova-compute/config-external.sh deleted file mode 120000 index bb13b939c..000000000 --- a/docker/centos/binary/nova/nova-compute/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-compute/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/nova/nova-compute/start.sh b/docker/centos/binary/nova/nova-compute/start.sh deleted file mode 120000 index 830400f9e..000000000 --- a/docker/centos/binary/nova/nova-compute/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-compute/start.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 deleted file mode 100644 index b29362dc0..000000000 --- a/docker/centos/binary/nova/nova-conductor/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - openstack-nova-conductor && yum clean all - -COPY start.sh / - -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-conductor/build b/docker/centos/binary/nova/nova-conductor/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-conductor/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/nova/nova-conductor/config-external.sh b/docker/centos/binary/nova/nova-conductor/config-external.sh deleted file mode 120000 index d98f3a875..000000000 --- a/docker/centos/binary/nova/nova-conductor/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-conductor/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/nova/nova-conductor/start.sh b/docker/centos/binary/nova/nova-conductor/start.sh deleted file mode 120000 index 0eb07db61..000000000 --- a/docker/centos/binary/nova/nova-conductor/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-conductor/start.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 deleted file mode 100644 index 48c5a866c..000000000 --- a/docker/centos/binary/nova/nova-consoleauth/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-nova-console && yum clean all - -COPY start.sh / - -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-consoleauth/build b/docker/centos/binary/nova/nova-consoleauth/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-consoleauth/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/nova/nova-consoleauth/config-external.sh b/docker/centos/binary/nova/nova-consoleauth/config-external.sh deleted file mode 120000 index b9d573470..000000000 --- a/docker/centos/binary/nova/nova-consoleauth/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-consoleauth/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/nova/nova-consoleauth/start.sh b/docker/centos/binary/nova/nova-consoleauth/start.sh deleted file mode 120000 index 658be8e2a..000000000 --- a/docker/centos/binary/nova/nova-consoleauth/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-consoleauth/start.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 deleted file mode 100644 index 856cab73e..000000000 --- a/docker/centos/binary/nova/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 / - -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-libvirt/build b/docker/centos/binary/nova/nova-libvirt/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/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/nova-libvirt/config-external.sh b/docker/centos/binary/nova/nova-libvirt/config-external.sh deleted file mode 120000 index e16a4f542..000000000 --- a/docker/centos/binary/nova/nova-libvirt/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-libvirt/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/nova/nova-libvirt/start.sh b/docker/centos/binary/nova/nova-libvirt/start.sh deleted file mode 120000 index 63ca58e26..000000000 --- a/docker/centos/binary/nova/nova-libvirt/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-libvirt/start.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 deleted file mode 100644 index 86cb3ccf8..000000000 --- a/docker/centos/binary/nova/nova-network/Dockerfile +++ /dev/null @@ -1,10 +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 start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-network/build b/docker/centos/binary/nova/nova-network/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/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/nova-network/config-external.sh b/docker/centos/binary/nova/nova-network/config-external.sh deleted file mode 120000 index 086eac04e..000000000 --- a/docker/centos/binary/nova/nova-network/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-network/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/nova/nova-network/start.sh b/docker/centos/binary/nova/nova-network/start.sh deleted file mode 120000 index 89c974d80..000000000 --- a/docker/centos/binary/nova/nova-network/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-network/start.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 deleted file mode 100644 index 9ca170a88..000000000 --- a/docker/centos/binary/nova/nova-novncproxy/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 \ - novnc openstack-nova-novncproxy && \ - yum clean all - -COPY start.sh / - -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-novncproxy/build b/docker/centos/binary/nova/nova-novncproxy/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-novncproxy/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/nova/nova-novncproxy/config-external.sh b/docker/centos/binary/nova/nova-novncproxy/config-external.sh deleted file mode 120000 index 8d2a91810..000000000 --- a/docker/centos/binary/nova/nova-novncproxy/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-novncproxy/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/nova/nova-novncproxy/start.sh b/docker/centos/binary/nova/nova-novncproxy/start.sh deleted file mode 120000 index b57c6a318..000000000 --- a/docker/centos/binary/nova/nova-novncproxy/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-novncproxy/start.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 deleted file mode 100644 index db7c11769..000000000 --- a/docker/centos/binary/nova/nova-scheduler/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - openstack-nova-scheduler && yum clean all - -COPY start.sh / - -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-scheduler/build b/docker/centos/binary/nova/nova-scheduler/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-scheduler/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/nova/nova-scheduler/config-external.sh b/docker/centos/binary/nova/nova-scheduler/config-external.sh deleted file mode 120000 index ef9c60c29..000000000 --- a/docker/centos/binary/nova/nova-scheduler/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-scheduler/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/nova/nova-scheduler/start.sh b/docker/centos/binary/nova/nova-scheduler/start.sh deleted file mode 120000 index b73e07a6a..000000000 --- a/docker/centos/binary/nova/nova-scheduler/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-scheduler/start.sh \ No newline at end of file -- cgit v1.2.3