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/source/nova/nova-base/.buildinfo | 13 ------------- docker/centos/source/nova/nova-base/Dockerfile | 24 ------------------------ docker/centos/source/nova/nova-base/build | 1 - 3 files changed, 38 deletions(-) delete mode 100644 docker/centos/source/nova/nova-base/.buildinfo delete mode 100644 docker/centos/source/nova/nova-base/Dockerfile delete mode 120000 docker/centos/source/nova/nova-base/build (limited to 'docker/centos/source/nova/nova-base') diff --git a/docker/centos/source/nova/nova-base/.buildinfo b/docker/centos/source/nova/nova-base/.buildinfo deleted file mode 100644 index 2c5f3d813..000000000 --- a/docker/centos/source/nova/nova-base/.buildinfo +++ /dev/null @@ -1,13 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=nova -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/nova} - -# Used for curl install method -# TODO(coolsvap) change to master once the changes -# in blueprint consolidate-libvirt-fs-volume-drivers -# Kolla bug : https://bugs.launchpad.net/kolla/+bug/1480231 -: ${TARBALL_URI:=http://tarballs.openstack.org/nova/nova-2015.1.1.tar.gz} diff --git a/docker/centos/source/nova/nova-base/Dockerfile b/docker/centos/source/nova/nova-base/Dockerfile deleted file mode 100644 index b15dcd20c..000000000 --- a/docker/centos/source/nova/nova-base/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - bridge-utils \ - && yum clean all - -RUN pip install \ - python-cinderclient \ - python-keystoneclient - -ADD ./nova.tar / -RUN ln -s /nova-* /nova - -RUN cd /nova \ - && useradd --user-group nova \ - && pip install -r requirements.txt \ - && pip install /nova \ - && tox -egenconfig \ - && mkdir /etc/nova /var/log/nova \ - && cp /nova/etc/nova/nova.conf.sample /etc/nova/nova.conf \ - && cp -r /nova/etc/nova/* /etc/nova/ \ - && chown -R nova: /etc/nova /var/log/nova \ - && rm -rf /root/.cache diff --git a/docker/centos/source/nova/nova-base/build b/docker/centos/source/nova/nova-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/nova/nova-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file -- cgit v1.2.3