diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 19:23:49 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 00:50:30 -0700 |
| commit | f895ee07cc5c1030e32854cf9a4e91bbeaf4de12 (patch) | |
| tree | cc7d17c2c63bf83f6a983553b8729f67abeac58d /docker/centos/source/heat | |
| parent | 5c82e0c90ce0fedf523b11b0b933f2276edf8f46 (diff) | |
| download | kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.tar.gz kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.zip | |
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
Diffstat (limited to 'docker/centos/source/heat')
| -rw-r--r-- | docker/centos/source/heat/heat-api-cfn/Dockerfile | 7 | ||||
| l--------- | docker/centos/source/heat/heat-api-cfn/build | 1 | ||||
| l--------- | docker/centos/source/heat/heat-api-cfn/config-external.sh | 1 | ||||
| l--------- | docker/centos/source/heat/heat-api-cfn/start.sh | 1 | ||||
| -rw-r--r-- | docker/centos/source/heat/heat-api/Dockerfile | 7 | ||||
| l--------- | docker/centos/source/heat/heat-api/build | 1 | ||||
| l--------- | docker/centos/source/heat/heat-api/config-external.sh | 1 | ||||
| l--------- | docker/centos/source/heat/heat-api/start.sh | 1 | ||||
| -rw-r--r-- | docker/centos/source/heat/heat-base/.buildinfo | 10 | ||||
| -rw-r--r-- | docker/centos/source/heat/heat-base/Dockerfile | 13 | ||||
| l--------- | docker/centos/source/heat/heat-base/build | 1 | ||||
| -rw-r--r-- | docker/centos/source/heat/heat-engine/Dockerfile | 7 | ||||
| l--------- | docker/centos/source/heat/heat-engine/build | 1 | ||||
| l--------- | docker/centos/source/heat/heat-engine/config-external.sh | 1 | ||||
| l--------- | docker/centos/source/heat/heat-engine/start.sh | 1 |
15 files changed, 0 insertions, 54 deletions
diff --git a/docker/centos/source/heat/heat-api-cfn/Dockerfile b/docker/centos/source/heat/heat-api-cfn/Dockerfile deleted file mode 100644 index fb0d48115..000000000 --- a/docker/centos/source/heat/heat-api-cfn/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/heat/heat-api-cfn/build b/docker/centos/source/heat/heat-api-cfn/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/heat/heat-api-cfn/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-api-cfn/config-external.sh b/docker/centos/source/heat/heat-api-cfn/config-external.sh deleted file mode 120000 index d1d084800..000000000 --- a/docker/centos/source/heat/heat-api-cfn/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api-cfn/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-api-cfn/start.sh b/docker/centos/source/heat/heat-api-cfn/start.sh deleted file mode 120000 index a71201d4b..000000000 --- a/docker/centos/source/heat/heat-api-cfn/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api-cfn/start.sh
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-api/Dockerfile b/docker/centos/source/heat/heat-api/Dockerfile deleted file mode 100644 index fb0d48115..000000000 --- a/docker/centos/source/heat/heat-api/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/heat/heat-api/build b/docker/centos/source/heat/heat-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/heat/heat-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-api/config-external.sh b/docker/centos/source/heat/heat-api/config-external.sh deleted file mode 120000 index bfc23ba35..000000000 --- a/docker/centos/source/heat/heat-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-api/start.sh b/docker/centos/source/heat/heat-api/start.sh deleted file mode 120000 index cf3eb022c..000000000 --- a/docker/centos/source/heat/heat-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api/start.sh
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-base/.buildinfo b/docker/centos/source/heat/heat-base/.buildinfo deleted file mode 100644 index 9ffa55fe4..000000000 --- a/docker/centos/source/heat/heat-base/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=heat -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/heat} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/heat/heat-master.tar.gz} diff --git a/docker/centos/source/heat/heat-base/Dockerfile b/docker/centos/source/heat/heat-base/Dockerfile deleted file mode 100644 index 72ff59556..000000000 --- a/docker/centos/source/heat/heat-base/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./heat.tar / -RUN ln -s /heat-* /heat - -RUN cd /heat \ - && useradd --user-group heat \ - && pip install -r requirements.txt \ - && pip install /heat \ - && mkdir /etc/heat /var/log/heat \ - && cp -r /heat/etc/heat/* /etc/heat/ \ - && rm -rf /root/.cache diff --git a/docker/centos/source/heat/heat-base/build b/docker/centos/source/heat/heat-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/heat/heat-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-engine/Dockerfile b/docker/centos/source/heat/heat-engine/Dockerfile deleted file mode 100644 index fb0d48115..000000000 --- a/docker/centos/source/heat/heat-engine/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/heat/heat-engine/build b/docker/centos/source/heat/heat-engine/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/heat/heat-engine/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-engine/config-external.sh b/docker/centos/source/heat/heat-engine/config-external.sh deleted file mode 120000 index a620c9e5b..000000000 --- a/docker/centos/source/heat/heat-engine/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-engine/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-engine/start.sh b/docker/centos/source/heat/heat-engine/start.sh deleted file mode 120000 index d660bc5d1..000000000 --- a/docker/centos/source/heat/heat-engine/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-engine/start.sh
\ No newline at end of file |
