diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-25 20:08:40 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-09-25 20:08:40 +0000 |
| commit | a1b0518b9a2d8c1e1ba188e10a55915eb49f6509 (patch) | |
| tree | ad25628eb5ccc7f0c1e915da13db1ee9fc984648 /docker/ceph | |
| parent | e4cc27ff4278a62981da435ad7d7dcee6158b1f2 (diff) | |
| download | kolla-a1b0518b9a2d8c1e1ba188e10a55915eb49f6509.tar.gz kolla-a1b0518b9a2d8c1e1ba188e10a55915eb49f6509.zip | |
Fix removal of config-external
I removed the files but not the COPY commands thus breaking all of
Kolla
Change-Id: I37d3e0cb94a1ecc12971f485f953310ba8fee53c
Partially-Implements: blueprint replace-config-external
Diffstat (limited to 'docker/ceph')
| -rw-r--r-- | docker/ceph/ceph-mon/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/ceph/ceph-osd/Dockerfile.j2 | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/docker/ceph/ceph-mon/Dockerfile.j2 b/docker/ceph/ceph-mon/Dockerfile.j2 index e8a1337ac..3f3d32a75 100644 --- a/docker/ceph/ceph-mon/Dockerfile.j2 +++ b/docker/ceph/ceph-mon/Dockerfile.j2 @@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceph-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-external.sh /opt/kolla/ COPY fetch_ceph_keys.py /usr/bin/ CMD ["/start.sh"] diff --git a/docker/ceph/ceph-osd/Dockerfile.j2 b/docker/ceph/ceph-osd/Dockerfile.j2 index e9d47fc70..5e1eacc40 100644 --- a/docker/ceph/ceph-osd/Dockerfile.j2 +++ b/docker/ceph/ceph-osd/Dockerfile.j2 @@ -2,6 +2,5 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceph-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] |