Merge "Fix up aodh config templates"

ansible/roles/aodh/templates/aodh-api.json.j2

@@ -9,12 +9,6 @@
             "owner": "aodh",
             "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",

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