diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-24 11:09:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-24 11:09:23 +0000 |
| commit | a1800d933c8c8e6badd1f4fe315ccedf895c6646 (patch) | |
| tree | 32a10a38a2b3180d78aaf02b10663afc2fc61562 | |
| parent | 61993554f9222c6ad26265e9b2c37eaa37828338 (diff) | |
| parent | 8a63cf45b5f4319a4758324d14ca8e9191c570be (diff) | |
| download | kolla-a1800d933c8c8e6badd1f4fe315ccedf895c6646.tar.gz kolla-a1800d933c8c8e6badd1f4fe315ccedf895c6646.zip | |
Merge "corrected line collapsing in ceilometer.conf"
| -rw-r--r-- | ansible/roles/ceilometer/templates/ceilometer.conf.j2 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ansible/roles/ceilometer/templates/ceilometer.conf.j2 b/ansible/roles/ceilometer/templates/ceilometer.conf.j2 index ef3d88cc3..1a4515830 100644 --- a/ansible/roles/ceilometer/templates/ceilometer.conf.j2 +++ b/ansible/roles/ceilometer/templates/ceilometer.conf.j2 @@ -26,7 +26,6 @@ metering_connection = mysql+pymysql://{{ ceilometer_database_user }}:{{ ceilomet {% endif %} [keystone_authtoken] -memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} project_domain_name = Default project_name = service @@ -36,6 +35,11 @@ password = {{ ceilometer_keystone_password }} auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} auth_type = password +memcache_security_strategy = ENCRYPT +memcache_secret_key = {{ memcache_secret_key }} +memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} + + [notification] store_events = true |