openstack/kolla
Code Issues Proposed changes

Fix up aodh config templates

Browse Source 
* The recently merged aodh role is trying to copy api_paste.ini on startup
which is already present at build time.

* memcache_servers was using incorrect for loop syntax

Note, the trim_blocks header is to solve the issue highlighted by
Jeffrey[0]

[0] http://lists.openstack.org/pipermail/openstack-dev/2016-September/103532.html

Change-Id: I8baa5446b3b6271d57d54c4c1663a338d8ab3cc8
Closes-Bug: #1624462
This commit is contained in:
Paul Bourke 2016-09-16 16:48:02 +01:00
parent 82c1a3d645
commit 3b8209c982
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/aodh/templates/aodh-api.json.j2
View File

@ -9,12 +9,6 @@
"owner": "aodh", "owner": "aodh",
"perm": "0644" "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", "source": "{{ container_config_directory }}/wsgi-aodh.conf",
"dest": "/etc/{{ aodh_dir }}/wsgi-aodh.conf", "dest": "/etc/{{ aodh_dir }}/wsgi-aodh.conf",

3
ansible/roles/aodh/templates/aodh.conf.j2
View File

@ -1,3 +1,4 @@
#jinja2: trim_blocks: False
[DEFAULT] [DEFAULT]
auth_strategy = keystone auth_strategy = keystone
log_dir = /var/log/kolla/aodh log_dir = /var/log/kolla/aodh
@ -17,7 +18,7 @@ connection = mysql+pymysql://{{ aodh_database_user }}:{{ aodh_database_password
[keystone_authtoken] [keystone_authtoken]
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} 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 }} auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
project_domain_name = default project_domain_name = default
project_name = service project_name = service