Merge "Change ceph version to Jewel"

5 files changed, 5 insertions, 29 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',
diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian
index edcf5214a..fc14f672f 100644
--- a/docker/base/sources.list.debian
+++ b/docker/base/sources.list.debian
@@ -14,7 +14,7 @@ deb http://security.debian.org jessie/updates main
 deb http://httpredir.debian.org/debian stretch main
 
 # Ceph repo
-deb http://download.ceph.com/debian-hammer/ jessie main
+deb http://download.ceph.com/debian-jewel/ jessie main
 
 # Maria DB repo
 deb [arch=amd64,i386] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/debian jessie main
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu
index b000673c5..510293712 100644
--- a/docker/base/sources.list.ubuntu
+++ b/docker/base/sources.list.ubuntu
@@ -17,7 +17,7 @@ deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu xenial main
 deb http://repo.percona.com/apt xenial main
 
 # Ceph repo
-deb http://download.ceph.com/debian-hammer/ xenial main
+deb http://download.ceph.com/debian-jewel/ xenial main
 
 # Elastic repo
 deb http://packages.elastic.co/elasticsearch/2.x/debian stable main
diff --git a/docker/base/versionlock.list b/docker/base/versionlock.list
deleted file mode 100644
index de2dd4cad..000000000
--- a/docker/base/versionlock.list
+++ /dev/null
@@ -1,12 +0,0 @@
-1:ceph-0.94.5-1.el7.*
-1:ceph-common-0.94.5-1.el7.*
-1:ceph-debuginfo-0.94.5-0.el7.*
-1:ceph-devel-compat-0.94.5-1.el7.*
-1:ceph-libs-compat-0.94.5-1.el7.*
-1:ceph-radosgw-0.94.5-1.el7.*
-1:librados2-0.94.5-1.el7.*
-1:libcephfs1-0.94.5-1.el7.*
-1:librbd1-0.94.5-1.el7.*
-1:python-cephfs-0.94.5-1.el7.*
-1:python-rados-0.94.5-1.el7.*
-1:python-rbd-0.94.5-1.el7.*
diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2
index ebd18d44d..aec79be74 100644
--- a/docker/ceph/ceph-base/Dockerfile.j2
+++ b/docker/ceph/ceph-base/Dockerfile.j2
@@ -24,10 +24,6 @@ MAINTAINER {{ maintainer }}
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start
 
-RUN useradd --user-group ceph \
-    && mkdir -p /home/ceph \
-    && chown -R ceph: /home/ceph
-
 {% block ceph_base_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 {{ include_footer }}