summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeb-Solon <openid@pyseb.cx>2017-10-25 21:04:50 -0400
committerSeb-Solon <openid@pyseb.cx>2017-10-26 09:19:43 -0400
commit2e812eb3161ed81880b8488464c8c6f68042800a (patch)
treebcfff564f33552bb40a3c5166f37121029aec4f5
parentd6736f20ac24fc332cb89a9983eb1af9e6aa261f (diff)
Replace ceilometer-dbsync by ceilometer-upgrade
ceilometer-dbsync is removed in pike release see : https://docs.openstack.org/releasenotes/ceilometer/en_GB/ocata.html Change-Id: I2d2407e4b0deb38e8fa410c9e96e2d16e69964e3 Closes-Bug: #1727329
Notes
Notes (review): Code-Review+2: Samuel Cassiba <s@cassiba.com> Workflow+1: Samuel Cassiba <s@cassiba.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sun, 29 Oct 2017 01:46:53 +0000 Reviewed-on: https://review.openstack.org/515250 Project: openstack/cookbook-openstack-telemetry Branch: refs/heads/master
-rw-r--r--README.md2
-rw-r--r--metadata.rb2
-rw-r--r--recipes/collector.rb2
-rw-r--r--spec/collector_spec.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/README.md b/README.md
index 47156cb..b5d378f 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Recipes
74- Install the client packages 74- Install the client packages
75 75
76## collector 76## collector
77- Installs collector package and service. If the NoSQL database is used for metering service, ceilometer-dbsync will not be executed. 77- Installs collector package and service. If the NoSQL database is used for metering service, ceilometer-upgrade will not be executed.
78 78
79## common 79## common
80- Common metering configuration. 80- Common metering configuration.
diff --git a/metadata.rb b/metadata.rb
index 00942dc..997c9cd 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -11,7 +11,7 @@ recipe 'openstack-telemetry::agent-compute', 'Installs agent compute service.'
11recipe 'openstack-telemetry::agent-notification', 'Installs the agent notification service.' 11recipe 'openstack-telemetry::agent-notification', 'Installs the agent notification service.'
12recipe 'openstack-telemetry::api', 'Installs API service.' 12recipe 'openstack-telemetry::api', 'Installs API service.'
13recipe 'openstack-telemetry::client', 'Installs client.' 13recipe 'openstack-telemetry::client', 'Installs client.'
14recipe 'openstack-telemetry::collector', 'Installs collector service. If the NoSQL database is used for metering service, ceilometer-dbsync will not be executed.' 14recipe 'openstack-telemetry::collector', 'Installs collector service. If the NoSQL database is used for metering service, ceilometer-upgrade will not be executed.'
15recipe 'openstack-telemetry::alarm-evaluator', 'Installs the alarm evaluator service.' 15recipe 'openstack-telemetry::alarm-evaluator', 'Installs the alarm evaluator service.'
16recipe 'openstack-telemetry::alarm-notifier', 'Installs the alarm notifier service.' 16recipe 'openstack-telemetry::alarm-notifier', 'Installs the alarm notifier service.'
17recipe 'openstack-telemetry::common', 'Common metering configuration.' 17recipe 'openstack-telemetry::common', 'Common metering configuration.'
diff --git a/recipes/collector.rb b/recipes/collector.rb
index a259b28..a0524c9 100644
--- a/recipes/collector.rb
+++ b/recipes/collector.rb
@@ -32,7 +32,7 @@ end
32 32
33conf_switch = "--config-file #{node['openstack']['telemetry']['conf_file']}" 33conf_switch = "--config-file #{node['openstack']['telemetry']['conf_file']}"
34execute 'database migration' do 34execute 'database migration' do
35 command "ceilometer-dbsync #{conf_switch}" 35 command "ceilometer-upgrade --skip-gnocchi-resource-types #{conf_switch}"
36end 36end
37 37
38service 'ceilometer-collector' do 38service 'ceilometer-collector' do
diff --git a/spec/collector_spec.rb b/spec/collector_spec.rb
index 1992b80..2123660 100644
--- a/spec/collector_spec.rb
+++ b/spec/collector_spec.rb
@@ -17,7 +17,7 @@ describe 'openstack-telemetry::collector' do
17 17
18 it do 18 it do
19 expect(chef_run).to run_execute( 19 expect(chef_run).to run_execute(
20 'ceilometer-dbsync --config-file /etc/ceilometer/ceilometer.conf' 20 'ceilometer-upgrade --skip-gnocchi-resource-types --config-file /etc/ceilometer/ceilometer.conf'
21 ) 21 )
22 end 22 end
23 23