diff options
| author |   Justin chi <chigang@huawei.com> | 2017-02-10 07:21:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-10 07:21:33 +0000 |
| commit | d4a90ad0ff4930f4853dc47dd11619a92a1fb1dd (patch) | |
| tree | 88e4f048385342c455d519ea2a8ed7e76b7796f0 | |
| parent | 0aa766999cafc84e5414448219ade9ae4e520c18 (diff) | |
| parent | 82fc55305e00fe535f3c23e5590700f7d7477223 (diff) | |
Merge "Ease to switch themes of Horizon"
| -rw-r--r-- | deploy/adapters/ansible/roles/dashboard/tasks/main.yml | 11 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/dashboard/templates/local_settings.py.j2 | 7 |
2 files changed, 11 insertions, 7 deletions
diff --git a/deploy/adapters/ansible/roles/dashboard/tasks/main.yml b/deploy/adapters/ansible/roles/dashboard/tasks/main.yml index 289bfa83..f52d802b 100644 --- a/deploy/adapters/ansible/roles/dashboard/tasks/main.yml +++ b/deploy/adapters/ansible/roles/dashboard/tasks/main.yml @@ -8,6 +8,8 @@ ############################################################################## --- - include_vars: "{{ ansible_os_family }}.yml" + tags: + - horizon_theme - name: disable auto start copy: @@ -26,13 +28,6 @@ state=absent when: ansible_os_family == "Debian" -- name: remove ubuntu theme - action: - "{{ ansible_pkg_mgr }} name=openstack-dashboard-ubuntu-theme state=absent" - when: ansible_os_family == 'Debian' and not enable_ubuntu_theme - notify: - - restart dashboard services - - name: remove default apache2 config file: path: '{{ item }}' @@ -78,6 +73,8 @@ when: ansible_os_family == 'Debian' notify: - restart dashboard services + tags: + - horizon_theme - name: precompile horizon css shell: | diff --git a/deploy/adapters/ansible/roles/dashboard/templates/local_settings.py.j2 b/deploy/adapters/ansible/roles/dashboard/templates/local_settings.py.j2 index 7278d5c2..c9530b93 100644 --- a/deploy/adapters/ansible/roles/dashboard/templates/local_settings.py.j2 +++ b/deploy/adapters/ansible/roles/dashboard/templates/local_settings.py.j2 @@ -97,6 +97,13 @@ DROPDOWN_MAX_ITEMS = 30 TIME_ZONE = "UTC" +{% if enable_ubuntu_theme == False %} +AVAILABLE_THEMES = [ + ('default', 'Default', 'themes/default'), + ('material', 'Material', 'themes/material'), +] +{% endif %} + LOGGING = { 'version': 1, 'disable_existing_loggers': False, |