aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-16 16:20:12 +0000
committerGerrit Code Review <review@openstack.org>2016-09-16 16:20:13 +0000
commit74b75d82455481217b8d3e89e96e36f569e30658 (patch)
tree35699a9bb85a66204c1147da61058446ea013622
parent012a222a1b6aee2ad455bc58f8edb10e9c4ee4bc (diff)
parentb76a613f4733e88d4bdda1060ecada5b094829a5 (diff)
downloadkolla-74b75d82455481217b8d3e89e96e36f569e30658.tar.gz
kolla-74b75d82455481217b8d3e89e96e36f569e30658.zip
Merge "Fix ceilometer.conf template"
-rw-r--r--ansible/roles/ceilometer/templates/ceilometer.conf.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/ceilometer/templates/ceilometer.conf.j2 b/ansible/roles/ceilometer/templates/ceilometer.conf.j2
index 6ffe3b476..e54211d1f 100644
--- a/ansible/roles/ceilometer/templates/ceilometer.conf.j2
+++ b/ansible/roles/ceilometer/templates/ceilometer.conf.j2
@@ -13,7 +13,7 @@ host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['addr
[database]
{% if ceilometer_database_type == "mongodb" %}
-connection = mongodb://{{ ceilometer_database_user }}:{{ ceilometer_database_password }}@{{ ceilometer_database_address }}:{{ mongodb_port }}/{{ ceilometer_database_name }}
+connection = mongodb://{{ ceilometer_database_user }}:{{ ceilometer_database_password }}@{{ ceilometer_database_address }}/{{ ceilometer_database_name }}
{% elif ceilometer_database_type == "mysql" %}
connection = mysql+pymysql://{{ ceilometer_database_user }}:{{ ceilometer_database_password }}@{{ ceilometer_database_address }}/{{ ceilometer_database_name }}
{% endif %}