openstack/kolla
Code Issues Proposed changes

Merge "Fix Oraclelinux build, disable collectd in gate"

Browse Source
This commit is contained in:
Zuul 2018-12-07 03:23:27 +00:00 committed by Gerrit Code Review
commit 32b795eeed
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker/base/Dockerfile.j2
View File

@ -42,7 +42,17 @@ RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version
{% block base_yum_conf %} {% block base_yum_conf %}
{% if base_distro in ['oraclelinux'] %}
{% set centos_contentdir = 'centos' %}
{% if base_arch in ['aarch64', 'ppc64le'] %}
{% set centos_contentdir = 'altarch' %}
{% endif %}
{% endif %}
COPY yum.conf /etc/yum.conf COPY yum.conf /etc/yum.conf
RUN echo {{ centos_contentdir }} >> /etc/yum/vars/contentdir
{% endblock %} {% endblock %}
#### BEGIN REPO ENABLEMENT #### BEGIN REPO ENABLEMENT
@ -176,11 +186,11 @@ RUN yum -y install \
yum-utils \ yum-utils \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
&& rpm -Uvh --nodeps \ && rpm -Uvh --nodeps \
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-ceph-luminous-1.1-2.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-opstools-1-8.el7.noarch.rpm \
http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-qemu-ev-1.0-2.el7.noarch.rpm \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-qemu-ev-1.0-3.el7.centos.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-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 \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-storage-common-2-2.el7.centos.noarch.rpm \
&& sed -i 's/\$releasever/7/g' /etc/yum.repos.d/CentOS-*.repo \ && sed -i 's/\$releasever/7/g' /etc/yum.repos.d/CentOS-*.repo \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools \ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools \

2
tests/playbooks/post.yml
View File

@ -1,7 +1,5 @@
--- ---
- hosts: all - hosts: all
roles:
- collect-collectd
tasks: tasks:
- shell: - shell:
cmd: | cmd: |

2
tests/playbooks/pre.yml
View File

@ -1,8 +1,6 @@
--- ---
- hosts: all - hosts: all
become: true become: true
roles:
- collectd
tasks: tasks:
- name: Install dbus for debian system - name: Install dbus for debian system
apt: name=dbus apt: name=dbus