diff options
| author |   liyuenan <liyuenan@huawei.com> | 2016-12-19 11:06:36 +0800 |
|---|---|---|
| committer | liyuenan <liyuenan@huawei.com> | 2016-12-20 15:05:03 +0800 |
| commit | 819912d0379f6cd2b2693c2968576f7514a117c5 (patch) | |
| tree | e24d274484fa1ec8976c9f1bd44f5ee6e445724b /deploy/adapters/ansible/openstack_mitaka/roles/apache | |
| parent | eb5dbdac42b1b7b775fbc1dc513376425a6898ff (diff) | |
master only support newton
JIRA: COMPASS-513
Remove other roles and ppa, master only support newton.
Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka/roles/apache')
| -rw-r--r-- | deploy/adapters/ansible/openstack_mitaka/roles/apache/files/index.html | 10 | ||||
| -rwxr-xr-x | deploy/adapters/ansible/openstack_mitaka/roles/apache/tasks/main.yml | 38 |
2 files changed, 0 insertions, 48 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/apache/files/index.html b/deploy/adapters/ansible/openstack_mitaka/roles/apache/files/index.html deleted file mode 100644 index f083c4f1..00000000 --- a/deploy/adapters/ansible/openstack_mitaka/roles/apache/files/index.html +++ /dev/null @@ -1,10 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<html> - <head> - <title>Index</title> - </head> - <body> - <a href="/horizon">Openstack Dashboard</a> - </body> -</html> - diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/apache/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka/roles/apache/tasks/main.yml deleted file mode 100755 index 44407bef..00000000 --- a/deploy/adapters/ansible/openstack_mitaka/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 |