Merge "Update puppet ceilometer upgrade dependency on service identity"
This commit is contained in:
commit
081cbf0240
|
@ -26,9 +26,9 @@ class openstack::ceilometer {
|
||||||
$::platform::kubernetes::params::enabled != true) {
|
$::platform::kubernetes::params::enabled != true) {
|
||||||
include ::openstack::gnocchi::params
|
include ::openstack::gnocchi::params
|
||||||
|
|
||||||
Keystone_endpoint["${::openstack::gnocchi::params::region_name}/gnocchi::metric"] ->
|
|
||||||
class { '::ceilometer::db::sync':
|
class { '::ceilometer::db::sync':
|
||||||
extra_params => '--skip-metering-database'
|
extra_params => '--skip-metering-database',
|
||||||
|
require => [Keystone::Resource::Service_identity["ceilometer", "gnocchi"]]
|
||||||
}
|
}
|
||||||
|
|
||||||
if $::platform::params::vswitch_type !~ '^ovs' {
|
if $::platform::params::vswitch_type !~ '^ovs' {
|
||||||
|
|
Loading…
Reference in New Issue