diff options
| author |   grakiss <grakiss.wanglei@huawei.com> | 2016-04-22 03:04:12 -0400 |
|---|---|---|
| committer | grakiss <grakiss.wanglei@huawei.com> | 2016-04-22 03:04:12 -0400 |
| commit | 80fbe88bf40d0bc18f0d68376893be49fa523932 (patch) | |
| tree | 9cdca980797cd256ddc31491a756bc83d4acb69e /deploy/adapters/ansible/roles/keystone | |
| parent | f255fcfcbceaad11647e55b59c33ae29f1a75c0c (diff) | |
FIX: mariadb cluster failed on centos7
JIRA:COMPASS-373
- use shell to support the parameter
- remove blank user
- adapte http service name and config path
Change-Id: I6625f3c53bfa8ff3e3792ec339aa2e63bcf1da83
Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/keystone')
4 files changed, 16 insertions, 6 deletions
diff --git a/deploy/adapters/ansible/roles/keystone/tasks/keystone_install.yml b/deploy/adapters/ansible/roles/keystone/tasks/keystone_install.yml index 78732496..ffae8ff0 100644 --- a/deploy/adapters/ansible/roles/keystone/tasks/keystone_install.yml +++ b/deploy/adapters/ansible/roles/keystone/tasks/keystone_install.yml @@ -61,10 +61,18 @@ notify: - restart keystone services +- name: update apache2 configs + template: + src: wsgi-keystone.conf.j2 + dest: '{{ apache_config_dir }}/wsgi-keystone.conf' + when: ansible_os_family == 'RedHat' + notify: + - restart keystone services + - name: enable keystone server file: - src: "/etc/apache2/sites-available/wsgi-keystone.conf" - dest: "/etc/apache2/sites-enabled/wsgi-keystone.conf" + src: "{{ apache_config_dir }}/sites-available/wsgi-keystone.conf" + dest: "{{ apache_config_dir }}/sites-enabled/wsgi-keystone.conf" state: "link" when: ansible_os_family == 'Debian' notify: diff --git a/deploy/adapters/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 b/deploy/adapters/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 index ff7526a8..64d864af 100644 --- a/deploy/adapters/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 +++ b/deploy/adapters/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 @@ -8,8 +8,8 @@ <IfVersion >= 2.4> ErrorLogFormat "%{cu}t %M" </IfVersion> - ErrorLog /var/log/apache2/keystone.log - CustomLog /var/log/apache2/keystone_access.log combined + ErrorLog /var/log/{{ http_service_name }}/keystone.log + CustomLog /var/log/{{ http_service_name }}/keystone_access.log combined <Directory /usr/bin> <IfVersion >= 2.4> @@ -31,8 +31,8 @@ <IfVersion >= 2.4> ErrorLogFormat "%{cu}t %M" </IfVersion> - ErrorLog /var/log/apache2/keystone.log - CustomLog /var/log/apache2/keystone_access.log combined + ErrorLog /var/log/{{ http_service_name }}/keystone.log + CustomLog /var/log/{{ http_service_name }}/keystone_access.log combined <Directory /usr/bin> <IfVersion >= 2.4> diff --git a/deploy/adapters/ansible/roles/keystone/vars/Debian.yml b/deploy/adapters/ansible/roles/keystone/vars/Debian.yml index ea7cd9d0..67547277 100644 --- a/deploy/adapters/ansible/roles/keystone/vars/Debian.yml +++ b/deploy/adapters/ansible/roles/keystone/vars/Debian.yml @@ -17,3 +17,4 @@ services: - apache2 apache_config_dir: /etc/apache2 +http_service_name: apache2 diff --git a/deploy/adapters/ansible/roles/keystone/vars/RedHat.yml b/deploy/adapters/ansible/roles/keystone/vars/RedHat.yml index 1785ed5b..38f8d91b 100644 --- a/deploy/adapters/ansible/roles/keystone/vars/RedHat.yml +++ b/deploy/adapters/ansible/roles/keystone/vars/RedHat.yml @@ -16,3 +16,4 @@ services: - httpd apache_config_dir: /etc/httpd/conf.d +http_service_name: httpd |