summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/apache
diff options
context:
space:
mode:
authorcarey.xu <carey.xuhan@huawei.com>2016-03-14 15:38:33 +0800
committercarey xu <carey.xuhan@huawei.com>2016-03-18 06:41:56 +0000
commit00826d9f9131b5b3d76d01c13912496ec6067204 (patch)
treee6b81ec95c2ec555b6f4b5a0bfc4e957cec837b2 /deploy/adapters/ansible/roles/apache
parent2490b7463f3a2fc86277f957945b92263495c01c (diff)
seperate apache2 installtion from dashboard
JIRA: COMPASS-342 Change-Id: I8ddbef46486dbd22f1324bda2d04f7a192b2148e Signed-off-by: carey.xu <carey.xuhan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/apache')
-rwxr-xr-xdeploy/adapters/ansible/roles/apache/handlers/main.yml12
-rwxr-xr-xdeploy/adapters/ansible/roles/apache/tasks/main.yml30
-rwxr-xr-xdeploy/adapters/ansible/roles/apache/templates/openstack-dashboard.conf.j215
-rw-r--r--deploy/adapters/ansible/roles/apache/templates/ports.conf.j21
-rwxr-xr-xdeploy/adapters/ansible/roles/apache/vars/Debian.yml17
-rwxr-xr-xdeploy/adapters/ansible/roles/apache/vars/RedHat.yml17
-rwxr-xr-xdeploy/adapters/ansible/roles/apache/vars/main.yml12
7 files changed, 104 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/apache/handlers/main.yml b/deploy/adapters/ansible/roles/apache/handlers/main.yml
new file mode 100755
index 00000000..0f28dc24
--- /dev/null
+++ b/deploy/adapters/ansible/roles/apache/handlers/main.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# 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
new file mode 100755
index 00000000..11e49c0b
--- /dev/null
+++ b/deploy/adapters/ansible/roles/apache/tasks/main.yml
@@ -0,0 +1,30 @@
+##############################################################################
+# 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 dashboard 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
new file mode 100755
index 00000000..403fcc22
--- /dev/null
+++ b/deploy/adapters/ansible/roles/apache/templates/openstack-dashboard.conf.j2
@@ -0,0 +1,15 @@
+{% set work_threads = (ansible_processor_vcpus + 1) // 2 %}
+
+<VirtualHost {{ internal_ip }}:80>
+ 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/
+ <Directory {{ horizon_dir }}/wsgi>
+ Order allow,deny
+ Allow from all
+ </Directory>
+</VirtualHost>
+
+
diff --git a/deploy/adapters/ansible/roles/apache/templates/ports.conf.j2 b/deploy/adapters/ansible/roles/apache/templates/ports.conf.j2
new file mode 100644
index 00000000..be27d195
--- /dev/null
+++ b/deploy/adapters/ansible/roles/apache/templates/ports.conf.j2
@@ -0,0 +1 @@
+Listen {{ internal_ip }}:80
diff --git a/deploy/adapters/ansible/roles/apache/vars/Debian.yml b/deploy/adapters/ansible/roles/apache/vars/Debian.yml
new file mode 100755
index 00000000..95e941eb
--- /dev/null
+++ b/deploy/adapters/ansible/roles/apache/vars/Debian.yml
@@ -0,0 +1,17 @@
+##############################################################################
+# 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
new file mode 100755
index 00000000..5211a12f
--- /dev/null
+++ b/deploy/adapters/ansible/roles/apache/vars/RedHat.yml
@@ -0,0 +1,17 @@
+##############################################################################
+# 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
new file mode 100755
index 00000000..f6fef749
--- /dev/null
+++ b/deploy/adapters/ansible/roles/apache/vars/main.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# 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: []