Browse Source

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
caoyuan 7 months ago
parent
commit
8ddb25da3f
4 changed files with 0 additions and 122 deletions
  1. 0
    18
      defaults/main.yml
  2. 0
    11
      handlers/main.yml
  3. 0
    8
      tasks/main.yml
  4. 0
    85
      tasks/tacker_horizon.yml

+ 0
- 18
defaults/main.yml View File

@@ -165,24 +165,6 @@ tacker_heat_stack_retry_wait: 5
165 165
 # heat service paramter for tacker.conf
166 166
 heat_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
170
-tackerclient_git_url: https://github.com/openstack/python-tackerclient.git
171
-tacker_git_branch: "master"
172
-
173
-# tacker horizon vars
174
-tacker_horizon_venv: "/openstack/venvs/horizon-{{ openstack_release }}"
175
-tacker_horizon_venv_bin: "{{ tacker_horizon_venv }}/bin"
176
-tacker_horizon_enable_path: "{{ tacker_horizon_venv }}/lib/python2.7/site-packages/openstack_dashboard/enabled"
177
-tacker_horizon_git: https://github.com/openstack/tacker-horizon.git
178
-
179
-
180
-tacker_horizon_dashboard_disable: "False"
181
-tacker_horizon_pip_packages:
182
-  - python-tackerclient
183
-
184
-
185
-
186 168
 # This variable is used by the repo_build process to determine
187 169
 # which host group to check for members of before building the
188 170
 # pip packages required by this role. The value is picked up

+ 0
- 11
handlers/main.yml View File

@@ -26,14 +26,3 @@
26 26
   failed_when: false
27 27
   listen:
28 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
-

+ 0
- 8
tasks/main.yml View File

@@ -90,13 +90,5 @@
90 90
   tags:
91 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 93
 - name: Flush handlers
102 94
   meta: flush_handlers

+ 0
- 85
tasks/tacker_horizon.yml View File

@@ -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
-

Loading…
Cancel
Save