From 9551bfa368420c3273471ecc4536045fa0dbe7b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=A1gr?= Date: Wed, 10 Jan 2018 12:41:17 +0100 Subject: [PATCH] Use community packages for Sensu Currently kolla override adds thirdparty repo for Sensu installation. This patch installs centos-release-opstools repo to use community packages instead. Change-Id: Ifb87e75c1bb813500e9d1926ede2d47eb247a014 --- container-images/tripleo_kolla_template_overrides.j2 | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2 index 1ed20b545..7fef99f07 100644 --- a/container-images/tripleo_kolla_template_overrides.j2 +++ b/container-images/tripleo_kolla_template_overrides.j2 @@ -14,19 +14,9 @@ enabled=1\n\ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo {% 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 {% 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 cinder_volume_packages_remove = ['scsi-target-utils'] %} {% set ironic_conductor_packages_remove = ['shellinabox'] %}