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
This commit is contained in:
parent
535aaf736d
commit
1f804e515b
@ -6,23 +6,11 @@ class packstack::ceilometer ()
|
|||||||
|
|
||||||
$config_gnocchi_host = lookup('CONFIG_KEYSTONE_HOST_URL')
|
$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' {
|
if $config_ceilometer_coordination_backend == 'redis' {
|
||||||
$redis_host = lookup('CONFIG_REDIS_HOST_URL')
|
$redis_host = lookup('CONFIG_REDIS_HOST_URL')
|
||||||
$redis_port = lookup('CONFIG_REDIS_PORT')
|
$redis_port = lookup('CONFIG_REDIS_PORT')
|
||||||
$coordination_url = "redis://${redis_host}:${redis_port}"
|
$coordination_url = "redis://${redis_host}:${redis_port}"
|
||||||
Service<| title == 'redis' |> -> Anchor['ceilometer::service::begin']
|
Service<| title == 'redis' |> -> Anchor['ceilometer::service::begin']
|
||||||
|
|
||||||
ensure_packages('python-redis', {
|
|
||||||
name => "python${pyvers}-redis",
|
|
||||||
tag => 'openstack',
|
|
||||||
})
|
|
||||||
} else {
|
} else {
|
||||||
$coordination_url = ''
|
$coordination_url = ''
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user