diff options
| author | Michal (inc0) Jastrzebski <inc007@gmail.com> | 2016-09-06 15:52:24 +0000 |
|---|---|---|
| committer | Michal (inc0) Jastrzebski <inc007@gmail.com> | 2016-09-09 14:30:36 +0000 |
| commit | 0a50cb8889f245bc89b49fbb2dacb9c02ded5f88 (patch) | |
| tree | d68f0b8a642e4ef7a337287c70edabc2e2bf70f0 /docker/base/Dockerfile.j2 | |
| parent | 682025c9e2fe834c697e96d219c54b70e641cbf8 (diff) | |
| download | kolla-0a50cb8889f245bc89b49fbb2dacb9c02ded5f88.tar.gz kolla-0a50cb8889f245bc89b49fbb2dacb9c02ded5f88.zip | |
Change ceph version to Jewel
This patch changes version of ceph from hammer to jewel. Also removed
versionlock as it seems we don't use it in ubuntu, and actually might be
risky if we miss security patch on ceph.
Change-Id: Ib8f88c2f914a4b635e59a509fa0194605eb73165
Implements: blueprint upgrade-ceph-to-jewel
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 1afeb1b47..ed2a4c5e0 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -85,7 +85,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 {% set base_centos_yum_repo_packages = [ 'epel-release ', 'yum-plugin-priorities', - 'centos-release-ceph-hammer', + 'centos-release-ceph-jewel', 'centos-release-qemu-ev' ] %} @@ -122,7 +122,7 @@ RUN yum -y install \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-5.noarch.rpm \ && rpm -Uvh --nodeps \ http://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-mitaka/centos-release-openstack-mitaka-1-3.el7.noarch.rpm \ - http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-hammer-1.0-5.el7.centos.noarch.rpm \ + 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-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 \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-storage-common-1-2.el7.centos.noarch.rpm \ @@ -156,15 +156,7 @@ RUN yum -y install \ {# We are back to the basic if conditional here which is: if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] #} - -{% block base_redhat_binary_versionlock %} -RUN yum -y update \ - && yum -y install \ - yum-plugin-versionlock \ - && yum clean all -COPY versionlock.list /etc/yum/pluginconf.d/ -{% endblock %} - +{% block base_redhat_binary_versionlock %}{% endblock %} {% if install_type == 'binary' %} {% set base_centos_binary_packages = [ 'sudo', |