openstack
/
kolla
Code Issues Proposed changes

Bump to ceph luminous 

Add ceph-mgr images

Change-Id: I875f84012a92d4f8b9dcb212d917cf61167270b8
Implements: blueprint ceph-luminous
This commit is contained in:
Jeffrey Zhang 2017-12-04 22:24:10 +08:00
parent e38683d212
commit 479f26d352
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/base/Dockerfile.j2
View File

@ -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 \

7
docker/ceph/ceph-mgr/Dockerfile.j2 Normal file
View File

@ -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 %}

4
releasenotes/notes/upgrade-ceph-luminous-415581032d25699e.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
Upgrade to ceph luminous