diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-11 13:07:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-11 13:07:15 +0000 |
| commit | d389d7aacff98687a7fb625292cf767543e91f15 (patch) | |
| tree | 5fe0c63b119a4548941e4b01de37582a4d0c1e5a | |
| parent | 73e232944cf9816946a662c66d8744e25a4f1e10 (diff) | |
| parent | a2bfe399a80010ca1da316c34ee60f799ae5413d (diff) | |
| download | kolla-d389d7aacff98687a7fb625292cf767543e91f15.tar.gz kolla-d389d7aacff98687a7fb625292cf767543e91f15.zip | |
Merge "Exclude port from ceilometer_database_mysql_address"
| -rw-r--r-- | ansible/roles/ceilometer/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/ceilometer/templates/ceilometer.conf.j2 | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ansible/roles/ceilometer/defaults/main.yml b/ansible/roles/ceilometer/defaults/main.yml index da9d47014..60205fe3e 100644 --- a/ansible/roles/ceilometer/defaults/main.yml +++ b/ansible/roles/ceilometer/defaults/main.yml @@ -10,7 +10,7 @@ ceilometer_database_user: "ceilometer" ceilometer_database_port: "{{ mongodb_port if ceilometer_database_type == 'mongodb' else database_port }}" ceilometer_database_mongodb_address: "{% for host in groups['mongodb'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ ceilometer_database_port }}{% if not loop.last %},{% endif %}{% endfor %}" -ceilometer_database_mysql_address: "{{ kolla_internal_fqdn }}:{{ ceilometer_database_port }}" +ceilometer_database_mysql_address: "{{ kolla_internal_fqdn }}" #################### diff --git a/ansible/roles/ceilometer/templates/ceilometer.conf.j2 b/ansible/roles/ceilometer/templates/ceilometer.conf.j2 index 1a4515830..726571f28 100644 --- a/ansible/roles/ceilometer/templates/ceilometer.conf.j2 +++ b/ansible/roles/ceilometer/templates/ceilometer.conf.j2 @@ -21,8 +21,8 @@ host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['addr event_connection = mongodb://{{ ceilometer_database_user }}:{{ ceilometer_database_password }}@{{ ceilometer_database_mongodb_address }}/{{ ceilometer_database_name }} metering_connection = mongodb://{{ ceilometer_database_user }}:{{ ceilometer_database_password }}@{{ ceilometer_database_mongodb_address }}/{{ ceilometer_database_name }} {% elif ceilometer_database_type == "mysql" %} -event_connection = mysql+pymysql://{{ ceilometer_database_user }}:{{ ceilometer_database_password }}@{{ ceilometer_database_mysql_address }}/{{ ceilometer_database_name }} -metering_connection = mysql+pymysql://{{ ceilometer_database_user }}:{{ ceilometer_database_password }}@{{ ceilometer_database_mysql_address }}/{{ ceilometer_database_name }} +event_connection = mysql+pymysql://{{ ceilometer_database_user }}:{{ ceilometer_database_password }}@{{ ceilometer_database_mysql_address }}:{{ ceilometer_database_port }}/{{ ceilometer_database_name }} +metering_connection = mysql+pymysql://{{ ceilometer_database_user }}:{{ ceilometer_database_password }}@{{ ceilometer_database_mysql_address }}:{{ ceilometer_database_port }}/{{ ceilometer_database_name }} {% endif %} [keystone_authtoken] |