From dfea1e345723f77a450eac20c6e0f7d03067cee0 Mon Sep 17 00:00:00 2001 From: "carey.xu" Date: Fri, 20 Nov 2015 00:15:45 +0800 Subject: bugfix: fix dashboard bug for redhat/centos version JIRA: COMPASS-164 Change-Id: Iedb2ea4943a0c10a48f0fe7146580f3ef90ca98b Signed-off-by: carey.xu --- deploy/adapters/ansible/roles/dashboard/tasks/main.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'deploy/adapters/ansible/roles/dashboard/tasks') diff --git a/deploy/adapters/ansible/roles/dashboard/tasks/main.yml b/deploy/adapters/ansible/roles/dashboard/tasks/main.yml index 01c7ebb3..c9eccfb4 100644 --- a/deploy/adapters/ansible/roles/dashboard/tasks/main.yml +++ b/deploy/adapters/ansible/roles/dashboard/tasks/main.yml @@ -6,7 +6,7 @@ with_items: http_packages - name: set http config - lineinfile: dest={{ http_config_file }} regexp='^Listen 80' line='Listen {{ internal_ip }}:80' + lineinfile: dest={{ http_config_file }} regexp='^Listen' line='Listen {{ internal_ip }}:80' - name: restart http services service: name={{ http_service }} state=restarted enabled=yes @@ -18,15 +18,17 @@ - name: remove ubuntu theme action: "{{ ansible_pkg_mgr }} name=openstack-dashboard-ubuntu-theme state=absent" -- name: update horizon settings - template: src=local_settings.py +- name: update ubuntu horizon settings + template: src=local_settings_debian dest=/etc/openstack-dashboard/local_settings.py backup=yes + when: ansible_os_family == 'Debian' -- name: update memcached conf - lineinfile: dest=/etc/memcached.conf state=present - regexp="-l *" - line="-l {{ internal_vip.ip }}" +- name: update redhat version horizon settings + template: src=local_settings_redhat + dest=/etc/openstack-dashboard/local_settings + backup=yes + when: ansible_os_family == 'RedHat' - name: restart dashboard services service: name={{ item }} state=restarted enabled=yes -- cgit 1.2.3-korg