Merge "Replace deprecated ceilometer::agent::auth"

This commit is contained in:
Zuul 2021-08-09 18:40:49 +00:00 committed by Gerrit Code Review
commit 88e883241a

View File

@ -62,7 +62,7 @@ class openstack_integration::ceilometer (
# gnocchi resource types. # gnocchi resource types.
include ceilometer::db::sync include ceilometer::db::sync
Service['httpd'] -> Exec['ceilometer-upgrade'] Service['httpd'] -> Exec['ceilometer-upgrade']
Class['ceilometer::agent::auth'] -> Exec['ceilometer-upgrade'] Class['ceilometer::agent::service_credentials'] -> Exec['ceilometer-upgrade']
Class['ceilometer::keystone::auth'] -> Exec['ceilometer-upgrade'] Class['ceilometer::keystone::auth'] -> Exec['ceilometer-upgrade']
Class['gnocchi::keystone::auth'] -> Exec['ceilometer-upgrade'] Class['gnocchi::keystone::auth'] -> Exec['ceilometer-upgrade']
@ -92,9 +92,9 @@ class openstack_integration::ceilometer (
class { 'ceilometer::agent::notification': } class { 'ceilometer::agent::notification': }
} }
class { 'ceilometer::agent::auth': class { 'ceilometer::agent::service_credentials':
auth_password => 'a_big_secret', password => 'a_big_secret',
auth_url => $::openstack_integration::config::keystone_auth_uri, auth_url => $::openstack_integration::config::keystone_auth_uri,
} }
} }