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 --- .../centos/source/ceilometer/ceilometer-alarm/Dockerfile | 7 ------- docker/centos/source/ceilometer/ceilometer-alarm/build | 1 - .../source/ceilometer/ceilometer-alarm/config-external.sh | 1 - docker/centos/source/ceilometer/ceilometer-alarm/start.sh | 1 - docker/centos/source/ceilometer/ceilometer-api/Dockerfile | 6 ------ docker/centos/source/ceilometer/ceilometer-api/build | 1 - .../source/ceilometer/ceilometer-api/config-external.sh | 1 - docker/centos/source/ceilometer/ceilometer-api/start.sh | 1 - .../centos/source/ceilometer/ceilometer-base/.buildinfo | 10 ---------- .../centos/source/ceilometer/ceilometer-base/Dockerfile | 15 --------------- docker/centos/source/ceilometer/ceilometer-base/build | 1 - .../source/ceilometer/ceilometer-central/Dockerfile | 7 ------- docker/centos/source/ceilometer/ceilometer-central/build | 1 - .../ceilometer/ceilometer-central/config-external.sh | 1 - .../centos/source/ceilometer/ceilometer-central/start.sh | 1 - .../source/ceilometer/ceilometer-collector/Dockerfile | 7 ------- .../centos/source/ceilometer/ceilometer-collector/build | 1 - .../ceilometer/ceilometer-collector/config-external.sh | 1 - .../source/ceilometer/ceilometer-collector/start.sh | 1 - .../source/ceilometer/ceilometer-compute/Dockerfile | 7 ------- docker/centos/source/ceilometer/ceilometer-compute/build | 1 - .../ceilometer/ceilometer-compute/config-external.sh | 1 - .../centos/source/ceilometer/ceilometer-compute/start.sh | 1 - .../source/ceilometer/ceilometer-notification/Dockerfile | 7 ------- .../source/ceilometer/ceilometer-notification/build | 1 - .../ceilometer/ceilometer-notification/config-external.sh | 1 - .../source/ceilometer/ceilometer-notification/start.sh | 1 - 27 files changed, 85 deletions(-) delete mode 100644 docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile delete mode 120000 docker/centos/source/ceilometer/ceilometer-alarm/build delete mode 120000 docker/centos/source/ceilometer/ceilometer-alarm/config-external.sh delete mode 120000 docker/centos/source/ceilometer/ceilometer-alarm/start.sh delete mode 100644 docker/centos/source/ceilometer/ceilometer-api/Dockerfile delete mode 120000 docker/centos/source/ceilometer/ceilometer-api/build delete mode 120000 docker/centos/source/ceilometer/ceilometer-api/config-external.sh delete mode 120000 docker/centos/source/ceilometer/ceilometer-api/start.sh delete mode 100644 docker/centos/source/ceilometer/ceilometer-base/.buildinfo delete mode 100644 docker/centos/source/ceilometer/ceilometer-base/Dockerfile delete mode 120000 docker/centos/source/ceilometer/ceilometer-base/build delete mode 100644 docker/centos/source/ceilometer/ceilometer-central/Dockerfile delete mode 120000 docker/centos/source/ceilometer/ceilometer-central/build delete mode 120000 docker/centos/source/ceilometer/ceilometer-central/config-external.sh delete mode 120000 docker/centos/source/ceilometer/ceilometer-central/start.sh delete mode 100644 docker/centos/source/ceilometer/ceilometer-collector/Dockerfile delete mode 120000 docker/centos/source/ceilometer/ceilometer-collector/build delete mode 120000 docker/centos/source/ceilometer/ceilometer-collector/config-external.sh delete mode 120000 docker/centos/source/ceilometer/ceilometer-collector/start.sh delete mode 100644 docker/centos/source/ceilometer/ceilometer-compute/Dockerfile delete mode 120000 docker/centos/source/ceilometer/ceilometer-compute/build delete mode 120000 docker/centos/source/ceilometer/ceilometer-compute/config-external.sh delete mode 120000 docker/centos/source/ceilometer/ceilometer-compute/start.sh delete mode 100644 docker/centos/source/ceilometer/ceilometer-notification/Dockerfile delete mode 120000 docker/centos/source/ceilometer/ceilometer-notification/build delete mode 120000 docker/centos/source/ceilometer/ceilometer-notification/config-external.sh delete mode 120000 docker/centos/source/ceilometer/ceilometer-notification/start.sh (limited to 'docker/centos/source/ceilometer') diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile b/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile deleted file mode 100644 index 86cf40d92..000000000 --- a/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/build b/docker/centos/source/ceilometer/ceilometer-alarm/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/ceilometer/ceilometer-alarm/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/config-external.sh b/docker/centos/source/ceilometer/ceilometer-alarm/config-external.sh deleted file mode 120000 index 0a48ebf52..000000000 --- a/docker/centos/source/ceilometer/ceilometer-alarm/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-alarm/config-external.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/start.sh b/docker/centos/source/ceilometer/ceilometer-alarm/start.sh deleted file mode 120000 index ed3ac528d..000000000 --- a/docker/centos/source/ceilometer/ceilometer-alarm/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-alarm/start.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-api/Dockerfile b/docker/centos/source/ceilometer/ceilometer-api/Dockerfile deleted file mode 100644 index 5db74a001..000000000 --- a/docker/centos/source/ceilometer/ceilometer-api/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ -CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-api/build b/docker/centos/source/ceilometer/ceilometer-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/ceilometer/ceilometer-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-api/config-external.sh b/docker/centos/source/ceilometer/ceilometer-api/config-external.sh deleted file mode 120000 index 4ea59dad7..000000000 --- a/docker/centos/source/ceilometer/ceilometer-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-api/config-external.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-api/start.sh b/docker/centos/source/ceilometer/ceilometer-api/start.sh deleted file mode 120000 index 7acfa2cba..000000000 --- a/docker/centos/source/ceilometer/ceilometer-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-api/start.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-base/.buildinfo b/docker/centos/source/ceilometer/ceilometer-base/.buildinfo deleted file mode 100644 index 70bd3d7d3..000000000 --- a/docker/centos/source/ceilometer/ceilometer-base/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=ceilometer -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/ceilometer} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/ceilometer/ceilometer-master.tar.gz} diff --git a/docker/centos/source/ceilometer/ceilometer-base/Dockerfile b/docker/centos/source/ceilometer/ceilometer-base/Dockerfile deleted file mode 100644 index 0b4e0e63d..000000000 --- a/docker/centos/source/ceilometer/ceilometer-base/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./ceilometer.tar / -RUN ln -s /ceilometer-* /ceilometer - -RUN cd /ceilometer \ - && useradd --user-group ceilometer \ - && pip install -r requirements.txt \ - && pip install /ceilometer \ - && mkdir /etc/ceilometer /var/log/ceilometer \ - && cp -r /ceilometer/etc/* /etc/ceilometer/ \ - && rm -rf /root/.cache - -CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-base/build b/docker/centos/source/ceilometer/ceilometer-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/ceilometer/ceilometer-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-central/Dockerfile b/docker/centos/source/ceilometer/ceilometer-central/Dockerfile deleted file mode 100644 index 86cf40d92..000000000 --- a/docker/centos/source/ceilometer/ceilometer-central/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-central/build b/docker/centos/source/ceilometer/ceilometer-central/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/ceilometer/ceilometer-central/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-central/config-external.sh b/docker/centos/source/ceilometer/ceilometer-central/config-external.sh deleted file mode 120000 index cfc69e75d..000000000 --- a/docker/centos/source/ceilometer/ceilometer-central/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-central/config-external.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-central/start.sh b/docker/centos/source/ceilometer/ceilometer-central/start.sh deleted file mode 120000 index 8df383cd1..000000000 --- a/docker/centos/source/ceilometer/ceilometer-central/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-central/start.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile b/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile deleted file mode 100644 index 86cf40d92..000000000 --- a/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-collector/build b/docker/centos/source/ceilometer/ceilometer-collector/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/ceilometer/ceilometer-collector/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-collector/config-external.sh b/docker/centos/source/ceilometer/ceilometer-collector/config-external.sh deleted file mode 120000 index e16dcecc1..000000000 --- a/docker/centos/source/ceilometer/ceilometer-collector/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-collector/config-external.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-collector/start.sh b/docker/centos/source/ceilometer/ceilometer-collector/start.sh deleted file mode 120000 index bea2eb09c..000000000 --- a/docker/centos/source/ceilometer/ceilometer-collector/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-collector/start.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile b/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile deleted file mode 100644 index 86cf40d92..000000000 --- a/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-compute/build b/docker/centos/source/ceilometer/ceilometer-compute/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/ceilometer/ceilometer-compute/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-compute/config-external.sh b/docker/centos/source/ceilometer/ceilometer-compute/config-external.sh deleted file mode 120000 index 1d0c728e5..000000000 --- a/docker/centos/source/ceilometer/ceilometer-compute/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-compute/config-external.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-compute/start.sh b/docker/centos/source/ceilometer/ceilometer-compute/start.sh deleted file mode 120000 index 1118b9552..000000000 --- a/docker/centos/source/ceilometer/ceilometer-compute/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-compute/start.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile b/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile deleted file mode 100644 index 86cf40d92..000000000 --- a/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-notification/build b/docker/centos/source/ceilometer/ceilometer-notification/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/ceilometer/ceilometer-notification/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-notification/config-external.sh b/docker/centos/source/ceilometer/ceilometer-notification/config-external.sh deleted file mode 120000 index 12d98d9ee..000000000 --- a/docker/centos/source/ceilometer/ceilometer-notification/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-notification/config-external.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-notification/start.sh b/docker/centos/source/ceilometer/ceilometer-notification/start.sh deleted file mode 120000 index 8e6d4e337..000000000 --- a/docker/centos/source/ceilometer/ceilometer-notification/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-notification/start.sh \ No newline at end of file -- cgit v1.2.3