From 819912d0379f6cd2b2693c2968576f7514a117c5 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Mon, 19 Dec 2016 11:06:36 +0800 Subject: master only support newton JIRA: COMPASS-513 Remove other roles and ppa, master only support newton. Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00 Signed-off-by: liyuenan --- .../roles/dashboard/handlers/main.yml | 12 -- .../openstack_osp9/roles/dashboard/tasks/main.yml | 121 --------------------- .../templates/openstack-dashboard-redhat.conf.j2 | 21 ---- .../dashboard/templates/openstack-dashboard.conf | 14 --- .../templates/openstack-dashboard.conf.j2 | 15 --- .../roles/dashboard/templates/ports.j2 | 15 --- .../openstack_osp9/roles/dashboard/vars/Debian.yml | 17 --- .../openstack_osp9/roles/dashboard/vars/RedHat.yml | 19 ---- .../openstack_osp9/roles/dashboard/vars/main.yml | 13 --- 9 files changed, 247 deletions(-) delete mode 100755 deploy/adapters/ansible/openstack_osp9/roles/dashboard/handlers/main.yml delete mode 100755 deploy/adapters/ansible/openstack_osp9/roles/dashboard/tasks/main.yml delete mode 100755 deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/openstack-dashboard-redhat.conf.j2 delete mode 100755 deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/openstack-dashboard.conf delete mode 100755 deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/openstack-dashboard.conf.j2 delete mode 100755 deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/ports.j2 delete mode 100755 deploy/adapters/ansible/openstack_osp9/roles/dashboard/vars/Debian.yml delete mode 100755 deploy/adapters/ansible/openstack_osp9/roles/dashboard/vars/RedHat.yml delete mode 100755 deploy/adapters/ansible/openstack_osp9/roles/dashboard/vars/main.yml (limited to 'deploy/adapters/ansible/openstack_osp9/roles/dashboard') diff --git a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/handlers/main.yml b/deploy/adapters/ansible/openstack_osp9/roles/dashboard/handlers/main.yml deleted file mode 100755 index 62e0b8e5..00000000 --- a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/handlers/main.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- name: restart dashboard services - service: name={{ item }} state=restarted enabled=yes - with_items: services | union(services_noarch) diff --git a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/tasks/main.yml b/deploy/adapters/ansible/openstack_osp9/roles/dashboard/tasks/main.yml deleted file mode 100755 index a6b813a7..00000000 --- a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/tasks/main.yml +++ /dev/null @@ -1,121 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- include_vars: "{{ ansible_os_family }}.yml" - -- name: disable auto start - copy: - content: "#!/bin/sh\nexit 101" - dest: "/usr/sbin/policy-rc.d" - mode: 0755 - when: ansible_os_family == "Debian" - -- name: install dashboard packages - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" - with_items: packages | union(packages_noarch) - -- name: enable auto start - file: - path=/usr/sbin/policy-rc.d - 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 }}' - state: absent - when: ansible_os_family == 'Debian' - with_items: - - '{{ apache_config_dir }}/conf-available/openstack-dashboard.conf' - - '{{ apache_config_dir }}/conf-enabled/openstack-dashboard.conf' - - '{{ apache_config_dir }}/sites-available/000-default.conf' - - '{{ apache_config_dir }}/sites-enabled/000-default.conf' - notify: - - restart dashboard services - -- name: update apache2 configs - template: - src: openstack-dashboard.conf.j2 - dest: '{{ apache_config_dir }}/sites-available/openstack-dashboard.conf' - when: ansible_os_family == 'Debian' - notify: - - restart dashboard services - -- name: update apache2 configs redhat - template: - src: openstack-dashboard-redhat.conf.j2 - dest: '{{ apache_config_dir }}/conf.d/openstack-dashboard.conf' - when: ansible_os_family == 'RedHat' - notify: - - restart dashboard services - -- name: enable dashboard - file: - src: "/etc/apache2/sites-available/openstack-dashboard.conf" - dest: "/etc/apache2/sites-enabled/openstack-dashboard.conf" - state: "link" - when: ansible_os_family == 'Debian' - notify: - - restart dashboard services - -- name: update ubuntu horizon settings - lineinfile: - dest: /etc/openstack-dashboard/local_settings.py - regexp: '{{ item.regexp }}' - line: '{{ item.line }}' - with_items: - - regexp: '^WEBROOT[ \t]*=.*' - line: 'WEBROOT = "/horizon"' - - regexp: '^COMPRESS_OFFLINE[ \t]*=.*' - line: 'COMPRESS_OFFLINE=True' - - regexp: '^ALLOWED_HOSTS[ \t]*=.*' - line: 'ALLOWED_HOSTS = ["*"]' - - regexp: '^OPENSTACK_HOST[ \t]*=.*' - line: 'OPENSTACK_HOST = "{{ internal_ip }}"' - when: ansible_os_family == 'Debian' - notify: - - restart dashboard services - -- name: precompile horizon css - shell: /usr/bin/python /usr/share/openstack-dashboard/manage.py compress --force - ignore_errors: True - when: ansible_os_family == 'Debian' - notify: - - restart dashboard services - -- name: update redhat version horizon settings - lineinfile: - dest: /etc/openstack-dashboard/local_settings - regexp: '{{ item.regexp }}' - line: '{{ item.line }}' - with_items: - - regexp: '^WEBROOT[ \t]*=.*' - line: 'WEBROOT = "/horizon"' - - regexp: '^COMPRESS_OFFLINE[ \t]*=.*' - line: 'COMPRESS_OFFLINE=False' - - regexp: '^ALLOWED_HOSTS[ \t]*=.*' - line: 'ALLOWED_HOSTS = ["*"]' - - regexp: '^OPENSTACK_HOST[ \t]*=.*' - line: 'OPENSTACK_HOST = "{{ internal_ip }}"' - when: ansible_os_family == 'RedHat' - notify: - - restart dashboard services - -- name: temperarily workaround for logo image issue - shell: sed -i "s/src=\"\/dashboard/src=\"\/horizon/g" /usr/share/openstack-dashboard/openstack_dashboard/themes/rcue/templates/horizon/common/_sidebar.html - when: ansible_distribution == 'RedHat' - notify: - - restart dashboard services -- meta: flush_handlers diff --git a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/openstack-dashboard-redhat.conf.j2 b/deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/openstack-dashboard-redhat.conf.j2 deleted file mode 100755 index d4d1f297..00000000 --- a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/openstack-dashboard-redhat.conf.j2 +++ /dev/null @@ -1,21 +0,0 @@ -{% set work_threads = (ansible_processor_vcpus + 1) // 2 %} - -WSGIDaemonProcess horizon processes={{ work_threads }} threads={{ work_threads }} -WSGIProcessGroup horizon -WSGISocketPrefix run/wsgi - -WSGIScriptAlias /horizon {{ horizon_dir }}/openstack_dashboard/wsgi/django.wsgi -Alias /horizon/static {{ horizon_dir }}/static - - - Options All - AllowOverride All - Require all granted - - - - Options All - AllowOverride All - Require all granted - - diff --git a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/openstack-dashboard.conf b/deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/openstack-dashboard.conf deleted file mode 100755 index a5a791a3..00000000 --- a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/openstack-dashboard.conf +++ /dev/null @@ -1,14 +0,0 @@ - - -WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi -WSGIDaemonProcess horizon user=www-data group=www-data processes=3 threads=10 -Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static/ - - -Order allow,deny -Allow from all - - - - - diff --git a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/openstack-dashboard.conf.j2 b/deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/openstack-dashboard.conf.j2 deleted file mode 100755 index 403fcc22..00000000 --- a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/openstack-dashboard.conf.j2 +++ /dev/null @@ -1,15 +0,0 @@ -{% set work_threads = (ansible_processor_vcpus + 1) // 2 %} - - - WSGIScriptAlias /horizon {{ horizon_dir }}/wsgi/django.wsgi - WSGIDaemonProcess horizon user=horizon group=horizon processes={{ work_threads }} threads={{ work_threads }} - WSGIProcessGroup horizon - Alias /static {{ horizon_dir }}/static/ - Alias /horizon/static {{ horizon_dir }}/static/ - - Order allow,deny - Allow from all - - - - diff --git a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/ports.j2 b/deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/ports.j2 deleted file mode 100755 index 0bfa0428..00000000 --- a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/templates/ports.j2 +++ /dev/null @@ -1,15 +0,0 @@ -# if you just change the port or add more ports here, you will likely also -# have to change the VirtualHost statement in -# /etc/apache2/sites-enabled/000-default.conf - -Listen {{ internal_ip }}:80 - - - Listen 443 - - - - Listen 443 - - -# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/vars/Debian.yml b/deploy/adapters/ansible/openstack_osp9/roles/dashboard/vars/Debian.yml deleted file mode 100755 index aaeb8cdb..00000000 --- a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/vars/Debian.yml +++ /dev/null @@ -1,17 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -packages: [] - -services: - - memcached - - apache2 - -apache_config_dir: /etc/apache2 -horizon_dir: /usr/share/openstack-dashboard/openstack_dashboard diff --git a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/vars/RedHat.yml b/deploy/adapters/ansible/openstack_osp9/roles/dashboard/vars/RedHat.yml deleted file mode 100755 index 651cbee3..00000000 --- a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/vars/RedHat.yml +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -packages: - - mod_wsgi - - httpd - -services: - - httpd - -http_config_file: "/etc/httpd/conf/httpd.conf" -apache_config_dir: /etc/httpd -horizon_dir: /usr/share/openstack-dashboard diff --git a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/vars/main.yml b/deploy/adapters/ansible/openstack_osp9/roles/dashboard/vars/main.yml deleted file mode 100755 index 2c940ede..00000000 --- a/deploy/adapters/ansible/openstack_osp9/roles/dashboard/vars/main.yml +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -packages_noarch: - - openstack-dashboard - -services_noarch: [] -- cgit 1.2.3-korg