diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-23 07:42:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-23 07:42:15 +0000 |
| commit | 5801e969e1b7dba20644783abaaa5adb7cef4d0d (patch) | |
| tree | d8500d94b5a8580623ad0e43c37c7476b2c4ab62 /ansible | |
| parent | aae4016908c06c4fbc60773818b81c21c8b15bde (diff) | |
| parent | 17333aed12775a439dc8d0699bf1811d7160ac55 (diff) | |
| download | kolla-5801e969e1b7dba20644783abaaa5adb7cef4d0d.tar.gz kolla-5801e969e1b7dba20644783abaaa5adb7cef4d0d.zip | |
Merge "Fix keystone for Ubuntu"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/keystone/templates/wsgi-keystone.conf.j2 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 index 7287e4b46..5c46c8be6 100644 --- a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 +++ b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 @@ -1,3 +1,4 @@ +{% set apache_dir = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %} Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_public_port }} Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_admin_port }} @@ -10,8 +11,8 @@ Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['addr <IfVersion >= 2.4> ErrorLogFormat "%{cu}t %M" </IfVersion> - ErrorLog /var/log/httpd/keystone.log - CustomLog /var/log/httpd/keystone_access.log combined + ErrorLog /var/log/{{ apache_dir }}/keystone.log + CustomLog /var/log/{{ apache_dir }}/keystone_access.log combined </VirtualHost> <VirtualHost *:{{ keystone_admin_port }}> @@ -23,6 +24,6 @@ Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['addr <IfVersion >= 2.4> ErrorLogFormat "%{cu}t %M" </IfVersion> - ErrorLog /var/log/httpd/keystone.log - CustomLog /var/log/httpd/keystone_access.log combined + ErrorLog /var/log/{{ apache_dir }}/keystone.log + CustomLog /var/log/{{ apache_dir }}/keystone_access.log combined </VirtualHost> |