Make Ceph work for RPM based distributions

Ceph packages need to be installed in nova, glance, and cinder.
Once that is done, Ceph works like a champ!

Change-Id: I296da1d04d0c1bcb729f22e65e432d53d561b49c
backport: liberty
Closes-Bug: #1505549
This commit is contained in:
Steven Dake 2015-10-13 03:56:20 -04:00
parent ba3b1bcf90
commit 1353538644
7 changed files with 39 additions and 3 deletions

View File

@ -42,6 +42,8 @@ ENV KOLLA_INSTALL_METATYPE {{ install_metatype }}
# Turns on MariaDB repos throughout the RPM build # Turns on MariaDB repos throughout the RPM build
COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo
COPY ceph.yum.repo /etc/yum.repos.d/ceph.repo
RUN yum install -y http://www.percona.com/redir/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm \ RUN yum install -y http://www.percona.com/redir/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm \
&& sed -i 's|$releasever|centos/latest|g' /etc/yum.repos.d/percona-release.repo && sed -i 's|$releasever|centos/latest|g' /etc/yum.repos.d/percona-release.repo

15
docker/base/ceph.yum.repo Normal file
View File

@ -0,0 +1,15 @@
[ceph-x86_64]
name=Ceph x86_64 packages
baseurl=http://ceph.com/rpm-hammer/el7/x86_64
enabled=1
gpgcheck=1
type=rpm-md
gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
[ceph-noarch]
name=Ceph noarch packages
baseurl=http://ceph.com/rpm-hammer/el7/noarch
enabled=1
gpgcheck=1
type=rpm-md
gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc

View File

@ -3,7 +3,10 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install ceph \ RUN yum -y install \
ceph \
parted \
hdparm \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}

View File

@ -7,7 +7,9 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-cinder \ RUN yum -y install openstack-cinder \
python-automaton \ python-automaton \
lvm2 \ lvm2 \
ceph-common \
&& yum clean all \ && yum clean all \
&& mkdir -p /etc/ceph \
&& sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \ && sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \
&& sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf && sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf

View File

@ -9,11 +9,22 @@ RUN yum -y install \
python-oslo-i18n \ python-oslo-i18n \
python-castellan \ python-castellan \
python-cryptography \ python-cryptography \
&& yum clean all python-rbd \
python-rados \
&& yum clean all \
&& mkdir -p /etc/ceph/
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['ubuntu', 'debian'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
python-rbd \
python-rados \
&& yum clean all \
&& mkdir -p /etc/ceph/
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
python-rbd \ python-rbd \

View File

@ -8,6 +8,7 @@ RUN yum -y install \
openstack-nova-compute \ openstack-nova-compute \
openvswitch \ openvswitch \
sysfsutils \ sysfsutils \
ceph-common \
&& yum clean all && yum clean all
{% endif %} {% endif %}
@ -19,6 +20,7 @@ RUN yum -y install \
openvswitch \ openvswitch \
qemu-img \ qemu-img \
sysfsutils \ sysfsutils \
ceph-common \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}

View File

@ -10,6 +10,7 @@ RUN yum -y install \
libvirt-daemon-driver-nwfilter \ libvirt-daemon-driver-nwfilter \
libvirt-daemon-config-nwfilter \ libvirt-daemon-config-nwfilter \
libvirt-daemon-driver-lxc \ libvirt-daemon-driver-lxc \
ceph-common \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}