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 --- .../openstack_osp9/roles/apache/files/index.html | 10 ------ .../openstack_osp9/roles/apache/tasks/main.yml | 38 ---------------------- 2 files changed, 48 deletions(-) delete mode 100755 deploy/adapters/ansible/openstack_osp9/roles/apache/files/index.html delete mode 100755 deploy/adapters/ansible/openstack_osp9/roles/apache/tasks/main.yml (limited to 'deploy/adapters/ansible/openstack_osp9/roles/apache') diff --git a/deploy/adapters/ansible/openstack_osp9/roles/apache/files/index.html b/deploy/adapters/ansible/openstack_osp9/roles/apache/files/index.html deleted file mode 100755 index f083c4f1..00000000 --- a/deploy/adapters/ansible/openstack_osp9/roles/apache/files/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - Index - - - Openstack Dashboard - - - diff --git a/deploy/adapters/ansible/openstack_osp9/roles/apache/tasks/main.yml b/deploy/adapters/ansible/openstack_osp9/roles/apache/tasks/main.yml deleted file mode 100755 index 44407bef..00000000 --- a/deploy/adapters/ansible/openstack_osp9/roles/apache/tasks/main.yml +++ /dev/null @@ -1,38 +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' - -- name: copy index.html file - copy: src=index.html dest=/var/www/html/index.html mode=0644 - when: ansible_os_family == 'RedHat' - -- name: copy index.html file - copy: src=index.html dest=/var/www/index.html mode=0644 - when: ansible_os_family == 'Debian' - -- meta: flush_handlers -- cgit 1.2.3-korg