starlingx
/
config
Code Issues Proposed changes

Update puppet ceilometer upgrade dependency on service identity 

The existing dependency for ceilometer upgrade cannot ensure that it
was executed after all service identites for ceilometer and gnocchi
were created. This causes ceilometer upgrade fails during subcloud
configuration since an ordering problem that ceilometer service not
being created before running ceilometer upgrade.
This commit is to update the dependency against the service identity
for ceilometer and gnocchi to ensure the correct ordering.

Closes-Bug: 1791303

Change-Id: Ibb4fb0fe15ba5c046d3c03478e4a9c1bee908f35
Signed-off-by: Angie Wang <angie.wang@windriver.com>
This commit is contained in:
Angie Wang 2018-09-07 16:32:37 -04:00
parent 43d38f3a68
commit d035cfabe5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet-manifests/src/modules/openstack/manifests/ceilometer.pp
View File

@ -24,9 +24,9 @@ class openstack::ceilometer {
if $::platform::params::distributed_cloud_role != 'systemcontroller' {
include ::openstack::gnocchi::params
Keystone_endpoint["${::openstack::gnocchi::params::region_name}/gnocchi::metric"] ->
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' {