openstack/puppet-openstack-integration
Code Issues Proposed changes

Remove legacy telemetry

Browse Source 
The ceilometer api is no longer a thing and should not be installed
anymore. This change removes the legacy telemetry options and switchs
Ubuntu to use gnocchi/panko.

Change-Id: I065c3bc11d6cb5bab89c5face2d01b671a517210
This commit is contained in:
Alex Schultz 2017-12-21 20:50:21 -07:00 committed by Emilien Macchi
parent c82fae7eed
commit 8278962136
2 changed files with 19 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fixtures/scenario001.pp
View File

@ -20,14 +20,12 @@ case $::osfamily {
# panko, gnocchi and vitrage are not packaged yet in debian/ubuntu
# https://bugs.launchpad.net/cloud-archive/+bug/1535740
$enable_vitrage = false
$enable_legacy_telemetry = true
$om_rpc = 'rabbit'
$om_notify = 'rabbit'
}
'RedHat': {
$ipv6 = true
$enable_vitrage = false
$enable_legacy_telemetry = false
$om_rpc = 'amqp'
$om_notify = 'rabbit'
}
@ -65,9 +63,7 @@ class { '::openstack_integration::nova':
class { '::openstack_integration::cinder':
backend => 'rbd',
}
class { '::openstack_integration::ceilometer':
enable_legacy_telemetry => $enable_legacy_telemetry
}
include ::openstack_integration::ceilometer
include ::openstack_integration::aodh
if $enable_vitrage {
include ::openstack_integration::vitrage
@ -75,18 +71,16 @@ if $enable_vitrage {
include ::openstack_integration::ceph
include ::openstack_integration::heat
include ::openstack_integration::provision
if ! $enable_legacy_telemetry {
include ::openstack_integration::redis
include ::openstack_integration::gnocchi
include ::openstack_integration::panko
}
include ::openstack_integration::redis
include ::openstack_integration::gnocchi
include ::openstack_integration::panko
class { '::openstack_integration::tempest':
cinder => true,
gnocchi => ! $enable_legacy_telemetry,
gnocchi => true,
ceilometer => true,
aodh => true,
heat => true,
panko => ! $enable_legacy_telemetry,
panko => true,
vitrage => $enable_vitrage,
}

67
manifests/ceilometer.pp
View File

@ -1,16 +1,10 @@
# Configure the Ceilometer service
#
# [*enable_legacy_telemetry*]
# (optional) Define if we use the legacy ceilometer database/service instead
# of Gnocchi and Panko
# Default to false.
#
# [*compute_namespace*]
# (optional) Enable polling for the compute namespace
# Default to true.
#
class openstack_integration::ceilometer (
$enable_legacy_telemetry = false,
$compute_namespace = true,
){
@ -57,57 +51,22 @@ class openstack_integration::ceilometer (
internal_url => "${::openstack_integration::config::base_url}:8777",
admin_url => "${::openstack_integration::config::base_url}:8777",
password => 'a_big_secret',
configure_endpoint => $enable_legacy_telemetry,
configure_endpoint => false,
}
if $enable_legacy_telemetry {
class { '::ceilometer::db::mysql':
password => 'ceilometer',
}
class { '::ceilometer::db':
database_connection => 'mysql+pymysql://ceilometer:ceilometer@127.0.0.1/ceilometer?charset=utf8',
}
class { '::ceilometer::keystone::authtoken':
password => 'a_big_secret',
user_domain_name => 'Default',
project_domain_name => 'Default',
auth_url => $::openstack_integration::config::keystone_admin_uri,
auth_uri => $::openstack_integration::config::keystone_auth_uri,
memcached_servers => $::openstack_integration::config::memcached_servers,
}
class { '::ceilometer::api':
enabled => true,
service_name => 'httpd',
}
include ::apache
class { '::ceilometer::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url,
ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/keystone/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path,
workers => '2',
}
class { '::ceilometer::expirer': }
# Gnocchi and Panko are not avialable on Ubuntu
$sample_pipeline_publishers = ['database://']
$event_pipeline_publishers = ['database://']
} else {
# We use Gnocchi/Panko instead of local database
class { '::ceilometer::db::sync':
extra_params => '--skip-metering-database',
}
# Ensure Gnocchi and creads are ready before running ceilometer-upgrade
Service['httpd'] -> Exec['ceilometer-upgrade']
Class['ceilometer::agent::auth'] -> Exec['ceilometer-upgrade']
Class['ceilometer::keystone::auth'] -> Exec['ceilometer-upgrade']
Class['gnocchi::keystone::auth'] -> Exec['ceilometer-upgrade']
# The default pipeline doesn't have Panko
$sample_pipeline_publishers = ['gnocchi://']
$event_pipeline_publishers = ['gnocchi://', 'panko://']
# We use Gnocchi/Panko instead of local database
class { '::ceilometer::db::sync':
extra_params => '--skip-metering-database',
}
# Ensure Gnocchi and creads are ready before running ceilometer-upgrade
Service['httpd'] -> Exec['ceilometer-upgrade']
Class['ceilometer::agent::auth'] -> Exec['ceilometer-upgrade']
Class['ceilometer::keystone::auth'] -> Exec['ceilometer-upgrade']
Class['gnocchi::keystone::auth'] -> Exec['ceilometer-upgrade']
# The default pipeline doesn't have Panko
$sample_pipeline_publishers = ['gnocchi://']
$event_pipeline_publishers = ['gnocchi://', 'panko://']
class { '::ceilometer::agent::notification':
notification_workers => '2',