From a61517fac89996ce3876e751d56bc385649a6f22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= Date: Fri, 9 Feb 2018 11:34:35 +0100 Subject: [PATCH] Fix SoftwareDeployments SoftwareDeployments need `os-collect-config` and `openstack-heat-agents` packages. First, on RHEL, try to enable the RHEL repository containing them; Second, on CentOS, try to enable the CentOS repository; Third, on RHEL, if the RHEL repository is not available, enable the RDO repository. --- .../fragments/install_config_agent_yum.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/collect-config-setup/fragments/install_config_agent_yum.sh b/collect-config-setup/fragments/install_config_agent_yum.sh index c425a43..3f8e6a8 100644 --- a/collect-config-setup/fragments/install_config_agent_yum.sh +++ b/collect-config-setup/fragments/install_config_agent_yum.sh @@ -11,15 +11,17 @@ set -eux if ! yum info os-collect-config; then # if os-collect-config package is not available, first check if # the repo is available but disabled, otherwise install the package - # from epel + # from centos or rdoproject if yum repolist disabled|grep rhel-7-server-openstack-$OSP_VERSION-rpms; then subscription-manager repos --enable="rhel-7-server-openstack-$OSP_VERSION-rpms" if [ "$OSP_VERSION" -lt 10 ] ; then subscription-manager repos --enable="rhel-7-server-openstack-$OSP_VERSION-director-rpms" fi - else + elif yum info centos-release-openstack-liberty; then yum -y install centos-release-openstack-liberty + else + yum -y install https://rdoproject.org/repos/openstack-pike/rdo-release-pike.rpm fi fi -yum -y install os-collect-config python-zaqarclient os-refresh-config os-apply-config openstack-heat-templates python-oslo-log python-psutil +yum -y install os-collect-config python-zaqarclient os-refresh-config os-apply-config openstack-heat-templates python-oslo-log python-psutil openstack-heat-agents #yum-config-manager --disable 'epel*'