openstack
/
salt-formula-ceilometer
Code Issues Proposed changes

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
This commit is contained in:
Ilya Tyaptin 2016-12-06 17:21:19 +04:00
parent fd766d4b87
commit aaddf0ee63
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ceilometer/files/mitaka/ceilometer-server.conf.Debian
View File

@ -193,15 +193,15 @@ alarm_history_time_to_live = {{ server.ttl }}
# 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)

2
ceilometer/map.jinja
View File

@ -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'],