Add new service level classes
Since Pike default ceilometer backend is gnocchi and database publishers
are deprecated, this commit create classes for ceilometer non-database
setup. This will allow to smoothly switch to Gnocchi as publisher. Also
if publisher isn't set in pillar, default publisher notifier will be used.
Change-Id: I78cf9e12591c474738c0bc14b1c1777974e876e0
Related-Prod: https://mirantis.jira.com/browse/PROD-20813
diff --git a/metadata/service/agent/cluster.yml b/metadata/service/agent/cluster/common.yml
similarity index 90%
rename from metadata/service/agent/cluster.yml
rename to metadata/service/agent/cluster/common.yml
index 588dc26..778dfbe 100644
--- a/metadata/service/agent/cluster.yml
+++ b/metadata/service/agent/cluster/common.yml
@@ -13,11 +13,6 @@
enabled: true
version: ${_param:ceilometer_version}
secret: ${_param:ceilometer_secret_key}
- publisher:
- default:
- enabled: true
- publish_event: true
- publish_metric: true
identity:
engine: keystone
host: ${_param:cluster_vip_address}
diff --git a/metadata/service/agent/cluster/init.yml b/metadata/service/agent/cluster/init.yml
new file mode 100644
index 0000000..258640a
--- /dev/null
+++ b/metadata/service/agent/cluster/init.yml
@@ -0,0 +1,12 @@
+applications:
+- ceilometer
+classes:
+- service.ceilometer.agent.cluster.common
+parameters:
+ ceilometer:
+ agent:
+ publisher:
+ default:
+ enabled: true
+ publish_event: true
+ publish_metric: true
\ No newline at end of file
diff --git a/metadata/service/agent/single.yml b/metadata/service/agent/single/common.yml
similarity index 90%
rename from metadata/service/agent/single.yml
rename to metadata/service/agent/single/common.yml
index b0a0058..34739ad 100644
--- a/metadata/service/agent/single.yml
+++ b/metadata/service/agent/single/common.yml
@@ -13,11 +13,6 @@
enabled: true
version: ${_param:ceilometer_version}
secret: ${_param:ceilometer_secret_key}
- publisher:
- default:
- enabled: true
- publish_event: true
- publish_metric: true
identity:
engine: keystone
host: ${_param:cluster_vip_address}
diff --git a/metadata/service/agent/single/init.yml b/metadata/service/agent/single/init.yml
new file mode 100644
index 0000000..e444d7d
--- /dev/null
+++ b/metadata/service/agent/single/init.yml
@@ -0,0 +1,12 @@
+applications:
+- ceilometer
+classes:
+- service.ceilometer.agent.single.common
+parameters:
+ ceilometer:
+ agent:
+ publisher:
+ default:
+ enabled: true
+ publish_event: true
+ publish_metric: true
\ No newline at end of file