diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-07 18:48:27 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-07 18:48:27 +0000 |
| commit | 65ed3c7f53ba19e8f221b293faa9021607c1f627 (patch) | |
| tree | c2ec269efee15b2d083ef2d3b8b295be73b9f701 /docker/centos/binary | |
| parent | a5e907a8e91bc4e1d8f563dc79db0ee96c15d380 (diff) | |
| download | kolla-65ed3c7f53ba19e8f221b293faa9021607c1f627.tar.gz kolla-65ed3c7f53ba19e8f221b293faa9021607c1f627.zip | |
Remove config-internal for gnocchi
Change-Id: Icf74913d03a780cd7c59fbc26a55344f2a12fdfa
Partially-implements: blueprint remove-config-internal
Diffstat (limited to 'docker/centos/binary')
6 files changed, 4 insertions, 7 deletions
diff --git a/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile index cd5974a22..eee474e37 100644 --- a/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile +++ b/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile @@ -6,5 +6,6 @@ RUN yum install -y openstack-gnocchi-api \ openstack-gnocchi-indexer-sqlalchemy \ && yum clean all -COPY ./start.sh /start.sh +COPY start.sh / + CMD ["/start.sh"] diff --git a/docker/centos/binary/gnocchi/gnocchi-api/config-internal.sh b/docker/centos/binary/gnocchi/gnocchi-api/config-internal.sh deleted file mode 120000 index 79578ce60..000000000 --- a/docker/centos/binary/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/binary/gnocchi/gnocchi-base/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile index e9d67da7c..30c8fbae3 100644 --- a/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile +++ b/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile @@ -1,4 +1,2 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY config-gnocchi.sh /opt/kolla/config-gnocchi.sh diff --git a/docker/centos/binary/gnocchi/gnocchi-base/config-gnocchi.sh b/docker/centos/binary/gnocchi/gnocchi-base/config-gnocchi.sh deleted file mode 120000 index 75a8a5e10..000000000 --- a/docker/centos/binary/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/binary/gnocchi/gnocchi-statsd/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile index 7998a3621..354c312d0 100644 --- a/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile +++ b/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile @@ -3,5 +3,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum install -y openstack-gnocchi-statsd && yum clean all -COPY ./start.sh /start.sh +COPY start.sh / + CMD ["/start.sh"] diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/config-internal.sh b/docker/centos/binary/gnocchi/gnocchi-statsd/config-internal.sh deleted file mode 120000 index 9d9ebfa7d..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-statsd/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-statsd/config-internal.sh
\ No newline at end of file |