diff options
| author |   Justin chi <chigang@huawei.com> | 2016-10-13 13:11:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-13 13:11:54 +0000 |
| commit | c85cae06ce80e7090b707974a50ab32de4aec28b (patch) | |
| tree | b1a594abe85e8a1dd7962fdd852d5f8ec86bff95 /deploy/adapters/ansible/openstack_newton_xenial/roles/apache | |
| parent | f3cea5848506d4b7822b47079c3f73415f295a14 (diff) | |
| parent | a8c4ed17ef020cf89085550541cd7d52b832e5f9 (diff) | |
Merge "Add the roles for OpenStack Newton"
Diffstat (limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/apache')
| -rwxr-xr-x | deploy/adapters/ansible/openstack_newton_xenial/roles/apache/tasks/main.yml | 31 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack_newton_xenial/roles/apache/templates/ports.conf.j2 | 3 |
2 files changed, 34 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/apache/tasks/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/apache/tasks/main.yml new file mode 100755 index 00000000..ad1d544f --- /dev/null +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/apache/tasks/main.yml @@ -0,0 +1,31 @@ +############################################################################## +# 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) + when ansible_os_family != 'Debian' + +- 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/openstack_newton_xenial/roles/apache/templates/ports.conf.j2 b/deploy/adapters/ansible/openstack_newton_xenial/roles/apache/templates/ports.conf.j2 new file mode 100644 index 00000000..f6c9c8b1 --- /dev/null +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/apache/templates/ports.conf.j2 @@ -0,0 +1,3 @@ +Listen {{ internal_ip }}:80 +Listen {{ internal_ip }}:5000 +Listen {{ internal_ip }}:35357 |