diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-12-04 22:24:10 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-12-05 16:33:16 +0800 |
| commit | 479f26d352eae5da4008891fa1c2813fb94cd899 (patch) | |
| tree | f1d6a09c9d4ff0e0e57fb4788338e8593a9e9a97 | |
| parent | e38683d2123b446c34d869912404b662bd56efa9 (diff) | |
| download | kolla-479f26d352eae5da4008891fa1c2813fb94cd899.tar.gz kolla-479f26d352eae5da4008891fa1c2813fb94cd899.zip | |
Bump to ceph luminous
Add ceph-mgr images
Change-Id: I875f84012a92d4f8b9dcb212d917cf61167270b8
Implements: blueprint ceph-luminous
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/ceph/ceph-mgr/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | releasenotes/notes/upgrade-ceph-luminous-415581032d25699e.yaml | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 2b234a460..b8a61482f 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -139,7 +139,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 ] %} {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [ - 'centos-release-ceph-jewel', + 'centos-release-ceph-luminous', 'centos-release-opstools', 'centos-release-qemu-ev' ] %} @@ -186,7 +186,7 @@ RUN yum -y install \ yum-utils \ https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ && rpm -Uvh --nodeps \ - http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-jewel-1.0-1.el7.centos.noarch.rpm \ + http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-luminous-1.0-1.el7.centos.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-opstools-1-7.el7.centos.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-qemu-ev-1.0-1.el7.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-virt-common-1-1.el7.centos.noarch.rpm \ diff --git a/docker/ceph/ceph-mgr/Dockerfile.j2 b/docker/ceph/ceph-mgr/Dockerfile.j2 new file mode 100644 index 000000000..86c0f5ca2 --- /dev/null +++ b/docker/ceph/ceph-mgr/Dockerfile.j2 @@ -0,0 +1,7 @@ +FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block ceph_mgr_header %}{% endblock %} + +{% block ceph_mgr_footer %}{% endblock %} +{% block footer %}{% endblock %} diff --git a/releasenotes/notes/upgrade-ceph-luminous-415581032d25699e.yaml b/releasenotes/notes/upgrade-ceph-luminous-415581032d25699e.yaml new file mode 100644 index 000000000..6aadca9f5 --- /dev/null +++ b/releasenotes/notes/upgrade-ceph-luminous-415581032d25699e.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Upgrade to ceph luminous |