Fix issue in mitaka config file and wrong service
This CR fix issue with invalid "if" in ceilometer-server.conf.Debian
and issue with redundant service in map.jinja
Change-Id: I83f64aec0fa43a709a7b687191e3441ca97ee976
diff --git a/ceilometer/files/mitaka/ceilometer-server.conf.Debian b/ceilometer/files/mitaka/ceilometer-server.conf.Debian
index f213cfb..bfd9232 100644
--- a/ceilometer/files/mitaka/ceilometer-server.conf.Debian
+++ b/ceilometer/files/mitaka/ceilometer-server.conf.Debian
@@ -193,15 +193,15 @@
# Deprecated group/name - [DEFAULT]/sql_connection
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
-metering_connection = stacklight://{{ server.database.influxdb.user }}:{{ server.database.influxdb.password }}@{{ server.database.influxdb.host }}:{{ server.database.influxdb.port }}/{{ server.database.influxdb.dbname }}
+metering_connection = stacklight://{{ server.database.influxdb.user }}:{{ server.database.influxdb.password }}@{{ server.database.influxdb.host }}:{{ server.database.influxdb.port }}/{{ server.database.influxdb.database }}
-{{{%- if server.database.elasticsearch.enabled %}}}
+{%- if server.database.elasticsearch.enabled %}
resource_connection = es://{{ server.database.elasticsearch.host}}:{{server.database.elasticsearch.port }}
event_connection = es://{{ server.database.elasticsearch.host}}:{{server.database.elasticsearch.port }}
-{{%- else %}}
+{%- else %}
resource_connection = es://localhost:9200
event_connection = log://
-{{%- endif }}
+{%- endif %}
# The SQLAlchemy connection string to use to connect to the slave
# database. (string value)
diff --git a/ceilometer/map.jinja b/ceilometer/map.jinja
index 59e94d4..34bd97f 100644
--- a/ceilometer/map.jinja
+++ b/ceilometer/map.jinja
@@ -30,7 +30,7 @@
'Debian': {
'alarm': ['ceilometer-alarm-evaluator', 'ceilometer-alarm-notifier'],
'collector': ['ceilometer-collector'],
- 'basic': ['ceilometer-api', 'ceilometer-agent-central', 'python-ceilometerclient', 'ceilometer-agent-notification'],
+ 'basic': ['ceilometer-api', 'ceilometer-agent-central', 'ceilometer-agent-notification'],
},
'RedHat': {
'alarm':['openstack-ceilometer-alarm-evaluator', 'openstack-ceilometer-alarm-notifier'],