openstack
/
kolla
Code Issues Proposed changes

Use proper CentOS repositories for ceph and qemu 

CentOS has a virtualization sig and storage sig which produces
udpated ceph and qemu images.  These images are then reused within
the rest of Red Hat packaging.  Install these repositories for
CentOS and make use of them.

This should work for OracleLinux as well.
Still testing centos.

Co-Authored-By: Vikram Hosakote <vhosakot@cisco.com>
Co-Authored-By: Paul Bourke <paul.bourke@oracle.com>

Change-Id: Iea21fc4f33bbfdb973cf354d492c372bd3360acb
Closes-Bug: #1566588
This commit is contained in:
Steven Dake 2016-04-06 01:55:31 -04:00 committed by Paul Bourke
parent 7a5290866d
commit e37fa65f4f
6 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ansible/roles/nova/tasks/config.yml
View File

@ -66,10 +66,13 @@
- "nova-scheduler"
- "nova-spicehtml5proxy"
- name: Copying over libvirtd.conf
- name: Copying over libvirt configuration
template:
src: "libvirtd.conf.j2"
dest: "{{ node_config_directory }}/nova-libvirt/libvirtd.conf"
src: "{{ item.src }}"
dest: "{{ node_config_directory }}/nova-libvirt/{{ item.dest }}"
with_items:
- { src: "qemu.conf.j2", dest: "qemu.conf" }
- { src: "libvirtd.conf.j2", dest: "libvirtd.conf" }
- name: Copying files for nova-ssh
template:

6
ansible/roles/nova/templates/nova-libvirt.json.j2
View File

@ -6,6 +6,12 @@
"dest": "/etc/libvirt/libvirtd.conf",
"owner": "root",
"perm": "0644"
},
{
"source": "{{ container_config_directory }}/qemu.conf",
"dest": "/etc/libvirt/qemu.conf",
"owner": "root",
"perm": "0644"
}{% if enable_ceph | bool %},
{
"source": "{{ container_config_directory }}/secrets",

0
ansible/roles/nova/templates/qemu.conf.j2 Normal file
View File

28
docker/base/Dockerfile.j2
View File

@ -38,12 +38,9 @@ COPY kibana.yum.repo /etc/yum.repos.d/kibana.yum.repo
# Turns on MariaDB repos throughout the RPM build
COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo
COPY ceph.yum.repo /etc/yum.repos.d/ceph.repo
RUN yum -y install http://repo.percona.com/release/7/RPMS/x86_64/percona-release-0.1-3.noarch.rpm
RUN rpm --import http://yum.mariadb.org/RPM-GPG-KEY-MariaDB \
&& rpm --import https://download.ceph.com/keys/release.asc \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Percona \
&& rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch
@ -67,8 +64,14 @@ RUN yum-config-manager --enable rhel-7-server-rpms \
{% if base_distro == 'centos' %}
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 \
&& yum install -y epel-release yum-plugin-priorities \
&& yum install -y \
epel-release \
yum-plugin-priorities \
centos-release-ceph-hammer \
centos-release-qemu-ev \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization \
&& yum clean all
{% endif %}
@ -79,7 +82,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 \
# Enable couple required repositories for all RHEL builds
# Turn on EPEL throughout the build
RUN yum install -y \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
https://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-5.noarch.rpm \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
&& yum -y install yum-plugin-priorities \
&& yum clean all \
@ -92,12 +95,23 @@ RUN yum install -y \
{% if base_distro == 'oraclelinux' %}
COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo
RUN yum install -y \
tar \
yum-utils \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-5.noarch.rpm \
&& yum clean all \
&& rpm -Uvh --nodeps \
http://mirror.centos.org/centos/7/extras/x86_64/Packages/centos-release-openstack-mitaka-1-2.el7.centos.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-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 \
&& sed -i 's/\$releasever/7/g' /etc/yum.repos.d/CentOS-*.repo \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
&& yum clean all
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization
RUN yum-config-manager --enable ol7_optional_latest ol7_addons
RUN yum install -y yum-plugin-priorities \
&& yum clean all

19
docker/base/ceph.yum.repo
View File

@ -1,19 +0,0 @@
[ceph-x86_64]
name=Ceph x86_64 packages
baseurl=http://download.ceph.com/rpm-hammer/el7/x86_64
enabled=1
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/release.asc
timeout=90
[ceph-noarch]
name=Ceph noarch packages
baseurl=http://download.ceph.com/rpm-hammer/el7/noarch
enabled=1
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/release.asc
timeout=90

26
docker/base/versionlock.list
View File

@ -1,13 +1,13 @@
1:ceph-0.94.5-0.el7.centos.*
1:ceph-common-0.94.5-0.el7.centos.*
1:ceph-debuginfo-0.94.5-0.el7.centos.*
1:ceph-devel-compat-0.94.5-0.el7.centos.*
1:ceph-libs-compat-0.94.5-0.el7.centos.*
1:ceph-radosgw-0.94.5-0.el7.centos.*
1:libcephfs1-0.94.5-0.el7.centos.*
1:librados2-0.94.5-0.el7.centos.*
1:librbd1-0.94.5-0.el7.centos.*
1:mesos-0.27.1
1:python-cephfs-0.94.5-0.el7.centos.*
1:python-rados-0.94.5-0.el7.centos.*
1:python-rbd-0.94.5-0.el7.centos.*
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:mesos-0.27.1*
1:python-cephfs-0.94.5-1.el7.*
1:python-rados-0.94.5-1.el7.*
1:python-rbd-0.94.5-1.el7.*