diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-10 05:16:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-10 05:16:14 +0000 |
| commit | 2a150c8908228e962bad8445cc47f53516806dce (patch) | |
| tree | 262138150a07a63545c39f3711c9c17d64905088 | |
| parent | 150701718d7982cebae964089cc1dbd0e7aa536e (diff) | |
| parent | 479f26d352eae5da4008891fa1c2813fb94cd899 (diff) | |
| download | kolla-2a150c8908228e962bad8445cc47f53516806dce.tar.gz kolla-2a150c8908228e962bad8445cc47f53516806dce.zip | |
Merge "Bump to 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 424070411..ee5921d1d 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 |