From 65ed3c7f53ba19e8f221b293faa9021607c1f627 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 7 Aug 2015 18:48:27 +0000 Subject: Remove config-internal for gnocchi Change-Id: Icf74913d03a780cd7c59fbc26a55344f2a12fdfa Partially-implements: blueprint remove-config-internal --- docker/centos/source/gnocchi/gnocchi-api/Dockerfile | 5 ++--- docker/centos/source/gnocchi/gnocchi-api/config-internal.sh | 1 - docker/centos/source/gnocchi/gnocchi-base/Dockerfile | 4 ---- docker/centos/source/gnocchi/gnocchi-base/config-gnocchi.sh | 1 - docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile | 5 ++--- docker/centos/source/gnocchi/gnocchi-statsd/config-internal.sh | 1 - 6 files changed, 4 insertions(+), 13 deletions(-) delete mode 120000 docker/centos/source/gnocchi/gnocchi-api/config-internal.sh delete mode 120000 docker/centos/source/gnocchi/gnocchi-base/config-gnocchi.sh delete mode 120000 docker/centos/source/gnocchi/gnocchi-statsd/config-internal.sh (limited to 'docker/centos/source') diff --git a/docker/centos/source/gnocchi/gnocchi-api/Dockerfile b/docker/centos/source/gnocchi/gnocchi-api/Dockerfile index 5c173f51e..ad16c6e00 100644 --- a/docker/centos/source/gnocchi/gnocchi-api/Dockerfile +++ b/docker/centos/source/gnocchi/gnocchi-api/Dockerfile @@ -1,8 +1,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) -COPY ./start.sh /start.sh - -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/gnocchi/gnocchi-api/config-internal.sh b/docker/centos/source/gnocchi/gnocchi-api/config-internal.sh deleted file mode 120000 index 79578ce60..000000000 --- a/docker/centos/source/gnocchi/gnocchi-api/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-api/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/gnocchi/gnocchi-base/Dockerfile b/docker/centos/source/gnocchi/gnocchi-base/Dockerfile index 2be4324ec..3bcc44125 100644 --- a/docker/centos/source/gnocchi/gnocchi-base/Dockerfile +++ b/docker/centos/source/gnocchi/gnocchi-base/Dockerfile @@ -11,7 +11,3 @@ RUN cd /gnocchi \ && mkdir /etc/gnocchi /var/log/gnocchi \ && cp -r /gnocchi/etc/* /etc/gnocchi/ \ && rm -rf /root/.cache - -COPY config-gnocchi.sh /opt/kolla/config-gnocchi.sh - -CMD ["/start.sh"] diff --git a/docker/centos/source/gnocchi/gnocchi-base/config-gnocchi.sh b/docker/centos/source/gnocchi/gnocchi-base/config-gnocchi.sh deleted file mode 120000 index 75a8a5e10..000000000 --- a/docker/centos/source/gnocchi/gnocchi-base/config-gnocchi.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-base/config-gnocchi.sh \ No newline at end of file diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile b/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile index 5c173f51e..ad16c6e00 100644 --- a/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile +++ b/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile @@ -1,8 +1,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) -COPY ./start.sh /start.sh - -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/config-internal.sh b/docker/centos/source/gnocchi/gnocchi-statsd/config-internal.sh deleted file mode 120000 index 9d9ebfa7d..000000000 --- a/docker/centos/source/gnocchi/gnocchi-statsd/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-statsd/config-internal.sh \ No newline at end of file -- cgit v1.2.3