openstack/tripleo-common
Code Issues Proposed changes

Merge "Use community packages for Sensu"

Browse Source
This commit is contained in:
Zuul 2018-01-16 11:02:29 +00:00 committed by Gerrit Code Review
commit 747e5a5a58
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
container-images/tripleo_kolla_template_overrides.j2
View File

@ -14,19 +14,9 @@ enabled=1\n\
gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo
{% endblock %} {% endblock %}
# Enable Sensu repo in Sensu Dockerfile
{% block sensu_base_header %}
RUN echo $'[sensu]\n\
name=sensu\n\
baseurl=https://sensu.global.ssl.fastly.net/yum/$releasever/$basearch/\n\
gpgcheck=1\n\
enabled=1\n\
gpgkey=https://sensu.global.ssl.fastly.net/yum/pubkey.gpg' >> /etc/yum.repos.d/sensu.repo
{% endblock %}
# Remove EPEL and the dependencies requiring it # Remove EPEL and the dependencies requiring it
{% set base_centos_yum_repo_packages_remove = ['epel-release', 'centos-release-ceph-jewel'] %} {% set base_centos_yum_repo_packages_remove = ['epel-release', 'centos-release-ceph-jewel'] %}
{% set base_centos_yum_repo_packages_append = ['centos-release-ceph-luminous'] %} {% set base_centos_yum_repo_packages_append = ['centos-release-ceph-luminous', 'centos-release-opstools'] %}
{% set base_centos_binary_packages_remove = ['scsi-target-utils'] %} {% set base_centos_binary_packages_remove = ['scsi-target-utils'] %}
{% set cinder_volume_packages_remove = ['scsi-target-utils'] %} {% set cinder_volume_packages_remove = ['scsi-target-utils'] %}
{% set ironic_conductor_packages_remove = ['shellinabox'] %} {% set ironic_conductor_packages_remove = ['shellinabox'] %}