From 1f804e515bc12232730436d24eaae2025b28dc9c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 18 Oct 2022 10:38:33 +0900 Subject: [PATCH] Ceilometer: Remove redundant installation of pythonN-redis The pythonN-redis is now indirectly required by the ceilometer-common package (ceilmeter-common -> pythonN-tooz -> pythonN-redis) so we no longer need to install the package explicitly. Change-Id: I45b17579c2fcbd8f1f8027043b57ee3b14950831 --- .../puppet/modules/packstack/manifests/ceilometer.pp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/packstack/puppet/modules/packstack/manifests/ceilometer.pp b/packstack/puppet/modules/packstack/manifests/ceilometer.pp index 8d14ef809..152c56a85 100644 --- a/packstack/puppet/modules/packstack/manifests/ceilometer.pp +++ b/packstack/puppet/modules/packstack/manifests/ceilometer.pp @@ -6,23 +6,11 @@ class packstack::ceilometer () $config_gnocchi_host = lookup('CONFIG_KEYSTONE_HOST_URL') - if ($::operatingsystem == 'Fedora') or - ($::osfamily == 'RedHat' and Integer.new($::operatingsystemmajrelease) > 7) { - $pyvers = '3' - } else { - $pyvers = '' - } - if $config_ceilometer_coordination_backend == 'redis' { $redis_host = lookup('CONFIG_REDIS_HOST_URL') $redis_port = lookup('CONFIG_REDIS_PORT') $coordination_url = "redis://${redis_host}:${redis_port}" Service<| title == 'redis' |> -> Anchor['ceilometer::service::begin'] - - ensure_packages('python-redis', { - name => "python${pyvers}-redis", - tag => 'openstack', - }) } else { $coordination_url = '' }