diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2020-02-13 11:10:24 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2020-02-14 08:52:23 +0000 |
| commit | abce4d5398d44b46161de2bf21914e776d16d7e7 (patch) | |
| tree | 6da2ab63dcd6ecf52680b2924b814add45e80832 /docker/ceph/ceph-base | |
| parent | 063a46a7de4471504535499ca2a972a79e4ce5e5 (diff) | |
| download | kolla-abce4d5398d44b46161de2bf21914e776d16d7e7.tar.gz kolla-abce4d5398d44b46161de2bf21914e776d16d7e7.zip | |
Remove kolla Ceph container images
This change removes ceph* Dockerfiles and relevant kolla python
code bits.
Kolla-Ansible part has been removed, and K-A was the only consumer.
Change-Id: I9568261fdbbe4b9156d0e07c414ec911ca2e8557
Diffstat (limited to 'docker/ceph/ceph-base')
| -rw-r--r-- | docker/ceph/ceph-base/Dockerfile.j2 | 58 | ||||
| -rw-r--r-- | docker/ceph/ceph-base/extend_start.sh | 8 |
2 files changed, 0 insertions, 66 deletions
diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 deleted file mode 100644 index 714a9b2e6..000000000 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ /dev/null @@ -1,58 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" - -{% block ceph_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='ceph') }} - -{{ macros.enable_extra_repos(['ceph', 'nfs-ganesha']) }} - -{% if base_package_type == 'rpm' %} - - {% set ceph_base_packages = [ - 'btrfs-progs', - 'ceph', - 'ceph-mgr-dashboard', - 'ceph-radosgw', - 'e2fsprogs', - 'gdisk', - 'hdparm', - 'parted', - 'smartmontools', - 'xfsprogs' - ] %} - - {% if base_arch in ['aarch64', 'x86_64'] %} - {% set ceph_base_packages = ceph_base_packages + [ - 'ceph-fuse' - ] %} - {% endif %} - -{% elif base_package_type == 'deb' %} - - {% set ceph_base_packages = [ - 'btrfs-progs', - 'ceph', - 'ceph-mds', - 'e2fsprogs', - 'hdparm', - 'parted', - 'radosgw', - 'xfsprogs' - ] %} - - {% if base_arch in ['x86_64'] %} - {% set ceph_base_packages = ceph_base_packages + [ - 'ceph-fuse' - ] %} - {% endif %} - -{% endif %} -{{ macros.install_packages(ceph_base_packages | customizable("packages")) }} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start - -{% block ceph_base_footer %}{% endblock %} diff --git a/docker/ceph/ceph-base/extend_start.sh b/docker/ceph/ceph-base/extend_start.sh deleted file mode 100644 index 968be0980..000000000 --- a/docker/ceph/ceph-base/extend_start.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/ceph" ]]; then - mkdir -p /var/log/kolla/ceph -fi -if [[ $(stat -c %a /var/log/kolla/ceph) != "755" ]]; then - chmod 755 /var/log/kolla/ceph -fi |
