Clean up the remaining stuff for dashboard
The tacker horizon is been done in openstack-ansible-os_horiozn[0], the temporary tacker horizon dashboard setup should be removed. [0]: https://review.openstack.org/#/c/603832/ Change-Id: Iccbb526773694b486534ffe16927237cb7c76371 Closes-Bug: #1796015
This commit is contained in:
parent
02b9f61306
commit
8ddb25da3f
|
@ -165,24 +165,6 @@ tacker_heat_stack_retry_wait: 5
|
|||
# heat service paramter for tacker.conf
|
||||
heat_service_adminurl: "{{ tacker_service_publicuri_proto }}://{{ external_lb_vip_address }}:8004/v1"
|
||||
|
||||
#NOTE: these default should be updated approprietly
|
||||
# tacker-horizon uses this
|
||||
tackerclient_git_url: https://github.com/openstack/python-tackerclient.git
|
||||
tacker_git_branch: "master"
|
||||
|
||||
# tacker horizon vars
|
||||
tacker_horizon_venv: "/openstack/venvs/horizon-{{ openstack_release }}"
|
||||
tacker_horizon_venv_bin: "{{ tacker_horizon_venv }}/bin"
|
||||
tacker_horizon_enable_path: "{{ tacker_horizon_venv }}/lib/python2.7/site-packages/openstack_dashboard/enabled"
|
||||
tacker_horizon_git: https://github.com/openstack/tacker-horizon.git
|
||||
|
||||
|
||||
tacker_horizon_dashboard_disable: "False"
|
||||
tacker_horizon_pip_packages:
|
||||
- python-tackerclient
|
||||
|
||||
|
||||
|
||||
# This variable is used by the repo_build process to determine
|
||||
# which host group to check for members of before building the
|
||||
# pip packages required by this role. The value is picked up
|
||||
|
|
|
@ -26,14 +26,3 @@
|
|||
failed_when: false
|
||||
listen:
|
||||
- "venv changed"
|
||||
|
||||
- name: Restart apache
|
||||
service:
|
||||
name: apache2
|
||||
state: restarted
|
||||
delegate_to: "{{ item }}"
|
||||
with_items:
|
||||
- "{{ groups['horizon_all'] }}"
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -90,13 +90,5 @@
|
|||
tags:
|
||||
- tacker-install
|
||||
|
||||
#NOTE: comment for now
|
||||
#- include_tasks: tacker_horizon.yml
|
||||
#when: >
|
||||
#inventory_hostname == groups['tacker_all'][0]
|
||||
#tags:
|
||||
#- tacker-install
|
||||
#- tacker-horizon
|
||||
|
||||
- name: Flush handlers
|
||||
meta: flush_handlers
|
||||
|
|
|
@ -1,85 +0,0 @@
|
|||
---
|
||||
# temporary tacker horizon dashboard setup
|
||||
# tacker-horizon install should done by horizon role
|
||||
# and probably different than this :)
|
||||
|
||||
# tacker horizon depends on tacker client
|
||||
- name: Clone tacker client
|
||||
git:
|
||||
repo: "{{ tackerclient_git_url }}"
|
||||
version: "{{ tacker_git_branch }}"
|
||||
dest: /tmp/python-tackerclient
|
||||
force: yes
|
||||
register: tackerclient_git_clone
|
||||
delegate_to: "{{ item }}"
|
||||
with_items:
|
||||
- "{{ groups['horizon_all'] }}"
|
||||
until: tackerclient_git_clone is success
|
||||
retries: 5
|
||||
delay: 2
|
||||
tags:
|
||||
- tacker-horizon-install
|
||||
|
||||
- name: Install tacker client into venv
|
||||
command: python setup.py install
|
||||
args:
|
||||
chdir: /tmp/python-tackerclient
|
||||
creates: /usr/local/bin/tacker
|
||||
delegate_to: "{{ item }}"
|
||||
with_items:
|
||||
- "{{ groups['horizon_all'] }}"
|
||||
tags:
|
||||
- tacker-horizon-install
|
||||
|
||||
- name: Clone tacker horizon source
|
||||
git:
|
||||
repo: "{{ tacker_horizon_git }}"
|
||||
version: stable/liberty
|
||||
dest: /tmp/python-tacker-horizon
|
||||
force: yes
|
||||
register: tackerhorizon_git_clone
|
||||
delegate_to: "{{ item }}"
|
||||
with_items:
|
||||
- "{{ groups['horizon_all'] }}"
|
||||
until: tackerhorizon_git_clone is success
|
||||
retries: 5
|
||||
delay: 2
|
||||
tags:
|
||||
- tacker-horizon-install
|
||||
|
||||
- name: Install tacker-horizon pip packages
|
||||
pip:
|
||||
name: "{{ tacker_requires_pip_packages | join(' ') }}"
|
||||
state: latest
|
||||
extra_args: "{{ pip_install_options_fact }}"
|
||||
register: install_packages
|
||||
until: install_packages is success
|
||||
retries: 5
|
||||
delay: 2
|
||||
|
||||
- name: Install tacker horizon into venv
|
||||
command: "{{ tacker_horizon_venv_bin }}/python setup.py install"
|
||||
args:
|
||||
chdir: /tmp/python-tacker-horizon
|
||||
creates:
|
||||
"{{ tacker_horizon_venv_bin }}/../lib/python2.7/site-packages/tacker_horizon"
|
||||
delegate_to: "{{ item }}"
|
||||
notify: Restart apache
|
||||
with_items:
|
||||
- "{{ groups['horizon_all'] }}"
|
||||
tags:
|
||||
- tacker-horizon-install
|
||||
|
||||
- name: Enable tacker in openstack dashboard
|
||||
command: cp openstack_dashboard_extensions/_80_nfv.py {{ tacker_horizon_enable_path }}/_80_nfv.py
|
||||
args:
|
||||
chdir: /tmp/python-tacker-horizon
|
||||
creates: "{{ tacker_horizon_enable_path }}/_80_nfv.py"
|
||||
delegate_to: "{{ item }}"
|
||||
notify: Restart apache
|
||||
with_items:
|
||||
- "{{ groups['horizon_all'] }}"
|
||||
tags:
|
||||
- tacker-horizon-install
|
||||
|
||||
|
Loading…
Reference in New Issue