From 95ecdb773c9fa90f9e4f1f792f5cc5dc8328fd6a Mon Sep 17 00:00:00 2001 From: chigang Date: Fri, 30 Jun 2017 20:24:25 +0800 Subject: Remove obsoleted code JIRA:- use OpenStack-ansible deploy openstack, so remove obsoleted code. Some of the enhanced features will be added in later versions Change-Id: Ie92b92b5de234a7d7d03b578b0bc15fd0218b3b3 Signed-off-by: chigang --- .../ansible/roles/apache/handlers/main.yml | 12 --------- .../adapters/ansible/roles/apache/tasks/main.yml | 30 ---------------------- .../apache/templates/openstack-dashboard.conf.j2 | 15 ----------- .../ansible/roles/apache/templates/ports.conf.j2 | 1 - .../adapters/ansible/roles/apache/vars/Debian.yml | 17 ------------ .../adapters/ansible/roles/apache/vars/RedHat.yml | 17 ------------ deploy/adapters/ansible/roles/apache/vars/main.yml | 12 --------- 7 files changed, 104 deletions(-) delete mode 100755 deploy/adapters/ansible/roles/apache/handlers/main.yml delete mode 100755 deploy/adapters/ansible/roles/apache/tasks/main.yml delete mode 100755 deploy/adapters/ansible/roles/apache/templates/openstack-dashboard.conf.j2 delete mode 100644 deploy/adapters/ansible/roles/apache/templates/ports.conf.j2 delete mode 100755 deploy/adapters/ansible/roles/apache/vars/Debian.yml delete mode 100755 deploy/adapters/ansible/roles/apache/vars/RedHat.yml delete mode 100755 deploy/adapters/ansible/roles/apache/vars/main.yml (limited to 'deploy/adapters/ansible/roles/apache') diff --git a/deploy/adapters/ansible/roles/apache/handlers/main.yml b/deploy/adapters/ansible/roles/apache/handlers/main.yml deleted file mode 100755 index 53e600dd..00000000 --- a/deploy/adapters/ansible/roles/apache/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 apache related services - service: name={{ item }} state=restarted enabled=yes - with_items: "{{ services| union(services_noarch) }}" diff --git a/deploy/adapters/ansible/roles/apache/tasks/main.yml b/deploy/adapters/ansible/roles/apache/tasks/main.yml deleted file mode 100755 index f87633a6..00000000 --- a/deploy/adapters/ansible/roles/apache/tasks/main.yml +++ /dev/null @@ -1,30 +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: install packages - action: "{{ ansible_pkg_mgr }} name={{ item }} state=latest update_cache=yes" - with_items: "{{ packages | union(packages_noarch) }}" - -- name: assure listen port exist - template: - dest: '{{ apache_config_dir }}/ports.conf' - src: ports.conf.j2 - notify: - - restart apache related services - -- name: remove default listen port on centos - lineinfile: - dest: /etc/httpd/conf/httpd.conf - state: absent - regexp: 'Listen 80' - when: ansible_os_family == 'RedHat' - -- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/apache/templates/openstack-dashboard.conf.j2 b/deploy/adapters/ansible/roles/apache/templates/openstack-dashboard.conf.j2 deleted file mode 100755 index 403fcc22..00000000 --- a/deploy/adapters/ansible/roles/apache/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/roles/apache/templates/ports.conf.j2 b/deploy/adapters/ansible/roles/apache/templates/ports.conf.j2 deleted file mode 100644 index be27d195..00000000 --- a/deploy/adapters/ansible/roles/apache/templates/ports.conf.j2 +++ /dev/null @@ -1 +0,0 @@ -Listen {{ internal_ip }}:80 diff --git a/deploy/adapters/ansible/roles/apache/vars/Debian.yml b/deploy/adapters/ansible/roles/apache/vars/Debian.yml deleted file mode 100755 index 95e941eb..00000000 --- a/deploy/adapters/ansible/roles/apache/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: - - apache2 - - libapache2-mod-wsgi - -services: - - apache2 - -apache_config_dir: /etc/apache2 diff --git a/deploy/adapters/ansible/roles/apache/vars/RedHat.yml b/deploy/adapters/ansible/roles/apache/vars/RedHat.yml deleted file mode 100755 index 5211a12f..00000000 --- a/deploy/adapters/ansible/roles/apache/vars/RedHat.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: - - mod_wsgi - - httpd - -services: - - httpd - -apache_config_dir: /etc/httpd/conf.d diff --git a/deploy/adapters/ansible/roles/apache/vars/main.yml b/deploy/adapters/ansible/roles/apache/vars/main.yml deleted file mode 100755 index f6fef749..00000000 --- a/deploy/adapters/ansible/roles/apache/vars/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 -############################################################################## ---- -packages_noarch: [] - -services_noarch: [] -- cgit 1.2.3-korg