diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-19 07:20:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-19 07:20:49 +0000 |
| commit | 0ec9d4ab7da00f3a7456734dbfe8c8f3963e013b (patch) | |
| tree | 752983fb6054f99246ce26c35f2fa32bf1b4bc13 /ansible | |
| parent | d75847772d0e880329eef5867caf4b87035d2ae0 (diff) | |
| parent | 3b8209c98218abfea0bd5b9f8f9ddf02888bd75a (diff) | |
| download | kolla-0ec9d4ab7da00f3a7456734dbfe8c8f3963e013b.tar.gz kolla-0ec9d4ab7da00f3a7456734dbfe8c8f3963e013b.zip | |
Merge "Fix up aodh config templates"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/aodh/templates/aodh-api.json.j2 | 6 | ||||
| -rw-r--r-- | ansible/roles/aodh/templates/aodh.conf.j2 | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/ansible/roles/aodh/templates/aodh-api.json.j2 b/ansible/roles/aodh/templates/aodh-api.json.j2 index 59fdc733c..ced2d1b6d 100644 --- a/ansible/roles/aodh/templates/aodh-api.json.j2 +++ b/ansible/roles/aodh/templates/aodh-api.json.j2 @@ -10,12 +10,6 @@ "perm": "0644" }, { - "source": "{{ container_config_directory }}/api_paste.ini", - "dest": "/etc/aodh/api_paste.ini", - "owner": "aodh", - "perm": "0644" - }, - { "source": "{{ container_config_directory }}/wsgi-aodh.conf", "dest": "/etc/{{ aodh_dir }}/wsgi-aodh.conf", "owner": "aodh", diff --git a/ansible/roles/aodh/templates/aodh.conf.j2 b/ansible/roles/aodh/templates/aodh.conf.j2 index aee2e1695..0295a44af 100644 --- a/ansible/roles/aodh/templates/aodh.conf.j2 +++ b/ansible/roles/aodh/templates/aodh.conf.j2 @@ -1,3 +1,4 @@ +#jinja2: trim_blocks: False [DEFAULT] auth_strategy = keystone log_dir = /var/log/kolla/aodh @@ -17,7 +18,7 @@ connection = mysql+pymysql://{{ aodh_database_user }}:{{ aodh_database_password [keystone_authtoken] memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} -memcache_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] +memcache_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 |