summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcaoyuan <cao.yuan@99cloud.net>2018-10-04 11:20:02 +0800
committercaoyuan <cao.yuan@99cloud.net>2018-10-04 14:36:25 +0800
commit8ddb25da3f0c400cfe60c63c9182bc99cb917b9e (patch)
treeb080cd3fa55d6628c8bf9373629cdb432e20c8fc
parent02b9f61306ff7fcd7efa8acdaba435ef35bf2341 (diff)
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
Notes
Notes (review): Code-Review+2: Markos Chandras (hwoarang) <mchandras@suse.de> Code-Review+2: Manuel Buil <mbuil@suse.com> Workflow+1: Manuel Buil <mbuil@suse.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 04 Oct 2018 13:37:56 +0000 Reviewed-on: https://review.openstack.org/607802 Project: openstack/openstack-ansible-os_tacker Branch: refs/heads/master
-rw-r--r--defaults/main.yml18
-rw-r--r--handlers/main.yml11
-rw-r--r--tasks/main.yml8
-rw-r--r--tasks/tacker_horizon.yml85
4 files changed, 0 insertions, 122 deletions
diff --git a/defaults/main.yml b/defaults/main.yml
index 92b101c..29730e6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -165,24 +165,6 @@ tacker_heat_stack_retry_wait: 5
165# heat service paramter for tacker.conf 165# heat service paramter for tacker.conf
166heat_service_adminurl: "{{ tacker_service_publicuri_proto }}://{{ external_lb_vip_address }}:8004/v1" 166heat_service_adminurl: "{{ tacker_service_publicuri_proto }}://{{ external_lb_vip_address }}:8004/v1"
167 167
168#NOTE: these default should be updated approprietly
169# tacker-horizon uses this
170tackerclient_git_url: https://github.com/openstack/python-tackerclient.git
171tacker_git_branch: "master"
172
173# tacker horizon vars
174tacker_horizon_venv: "/openstack/venvs/horizon-{{ openstack_release }}"
175tacker_horizon_venv_bin: "{{ tacker_horizon_venv }}/bin"
176tacker_horizon_enable_path: "{{ tacker_horizon_venv }}/lib/python2.7/site-packages/openstack_dashboard/enabled"
177tacker_horizon_git: https://github.com/openstack/tacker-horizon.git
178
179
180tacker_horizon_dashboard_disable: "False"
181tacker_horizon_pip_packages:
182 - python-tackerclient
183
184
185
186# This variable is used by the repo_build process to determine 168# This variable is used by the repo_build process to determine
187# which host group to check for members of before building the 169# which host group to check for members of before building the
188# pip packages required by this role. The value is picked up 170# pip packages required by this role. The value is picked up
diff --git a/handlers/main.yml b/handlers/main.yml
index cb375e4..3c974ad 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -26,14 +26,3 @@
26 failed_when: false 26 failed_when: false
27 listen: 27 listen:
28 - "venv changed" 28 - "venv changed"
29
30- name: Restart apache
31 service:
32 name: apache2
33 state: restarted
34 delegate_to: "{{ item }}"
35 with_items:
36 - "{{ groups['horizon_all'] }}"
37
38
39
diff --git a/tasks/main.yml b/tasks/main.yml
index 84253e4..4a9640c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -90,13 +90,5 @@
90 tags: 90 tags:
91 - tacker-install 91 - tacker-install
92 92
93#NOTE: comment for now
94#- include_tasks: tacker_horizon.yml
95 #when: >
96 #inventory_hostname == groups['tacker_all'][0]
97 #tags:
98 #- tacker-install
99 #- tacker-horizon
100
101- name: Flush handlers 93- name: Flush handlers
102 meta: flush_handlers 94 meta: flush_handlers
diff --git a/tasks/tacker_horizon.yml b/tasks/tacker_horizon.yml
deleted file mode 100644
index 92ba380..0000000
--- a/tasks/tacker_horizon.yml
+++ /dev/null
@@ -1,85 +0,0 @@
1---
2# temporary tacker horizon dashboard setup
3# tacker-horizon install should done by horizon role
4# and probably different than this :)
5
6# tacker horizon depends on tacker client
7- name: Clone tacker client
8 git:
9 repo: "{{ tackerclient_git_url }}"
10 version: "{{ tacker_git_branch }}"
11 dest: /tmp/python-tackerclient
12 force: yes
13 register: tackerclient_git_clone
14 delegate_to: "{{ item }}"
15 with_items:
16 - "{{ groups['horizon_all'] }}"
17 until: tackerclient_git_clone is success
18 retries: 5
19 delay: 2
20 tags:
21 - tacker-horizon-install
22
23- name: Install tacker client into venv
24 command: python setup.py install
25 args:
26 chdir: /tmp/python-tackerclient
27 creates: /usr/local/bin/tacker
28 delegate_to: "{{ item }}"
29 with_items:
30 - "{{ groups['horizon_all'] }}"
31 tags:
32 - tacker-horizon-install
33
34- name: Clone tacker horizon source
35 git:
36 repo: "{{ tacker_horizon_git }}"
37 version: stable/liberty
38 dest: /tmp/python-tacker-horizon
39 force: yes
40 register: tackerhorizon_git_clone
41 delegate_to: "{{ item }}"
42 with_items:
43 - "{{ groups['horizon_all'] }}"
44 until: tackerhorizon_git_clone is success
45 retries: 5
46 delay: 2
47 tags:
48 - tacker-horizon-install
49
50- name: Install tacker-horizon pip packages
51 pip:
52 name: "{{ tacker_requires_pip_packages | join(' ') }}"
53 state: latest
54 extra_args: "{{ pip_install_options_fact }}"
55 register: install_packages
56 until: install_packages is success
57 retries: 5
58 delay: 2
59
60- name: Install tacker horizon into venv
61 command: "{{ tacker_horizon_venv_bin }}/python setup.py install"
62 args:
63 chdir: /tmp/python-tacker-horizon
64 creates:
65 "{{ tacker_horizon_venv_bin }}/../lib/python2.7/site-packages/tacker_horizon"
66 delegate_to: "{{ item }}"
67 notify: Restart apache
68 with_items:
69 - "{{ groups['horizon_all'] }}"
70 tags:
71 - tacker-horizon-install
72
73- name: Enable tacker in openstack dashboard
74 command: cp openstack_dashboard_extensions/_80_nfv.py {{ tacker_horizon_enable_path }}/_80_nfv.py
75 args:
76 chdir: /tmp/python-tacker-horizon
77 creates: "{{ tacker_horizon_enable_path }}/_80_nfv.py"
78 delegate_to: "{{ item }}"
79 notify: Restart apache
80 with_items:
81 - "{{ groups['horizon_all'] }}"
82 tags:
83 - tacker-horizon-install
84
85