Isolate Apache components

In preparation for moving keystone to uwsgi under nginx the Apache
related components are being isolated so a branched install option
(keystone_apache_mod_wsgi_enabled) can be used to accommodate both
deployment models.

Change-Id: Idd9de25d1906dba526b5761ad1a8f75b672af29d
Related: blueprint keystone-uwsgi

defaults/main.yml

@@ -163,6 +163,7 @@ keystone_service_adminurl: "{{ keystone_service_adminurl_v3 }}"
 #keystone_public_endpoint: "{{ keystone_service_publicuri }}"
 
 ## Apache setup
+keystone_apache_mod_wsgi_enabled: true
 keystone_apache_log_level: info
 keystone_apache_custom_log_format: combined
 keystone_apache_servertokens: "Prod"

handlers/main.yml

@@ -22,6 +22,7 @@
   until: apache_restart|success
   retries: 5
   delay: 2
+  when: keystone_apache_mod_wsgi_enabled | bool
 
 - name: Restart Shibd
   service:

tasks/keystone_install_apt.yml

@@ -32,6 +32,17 @@
   delay: 2
   with_items: "{{ keystone_apt_packages }}"
 
+- name: Install Apache apt packages
+  apt:
+    pkg: "{{ item }}"
+    state: "{{ keystone_package_state }}"
+  register: install_packages
+  until: install_packages|success
+  retries: 5
+  delay: 2
+  with_items: "{{ keystone_apache_apt_packages }}"
+  when: keystone_apache_mod_wsgi_enabled | bool
+
 - name: Install IdP apt packages
   apt:
     pkg: "{{ item }}"
@@ -41,7 +52,9 @@
   retries: 5
   delay: 2
   with_items: "{{ keystone_idp_apt_packages }}"
-  when: keystone_idp != {}
+  when:
+    - keystone_apache_mod_wsgi_enabled | bool
+    - keystone_idp != {}
 
 - name: Install SP apt packages
   apt:
@@ -52,7 +65,9 @@
   retries: 5
   delay: 2
   with_items: "{{ keystone_sp_apt_packages }}"
-  when: keystone_sp != {}
+  when:
+    - keystone_apache_mod_wsgi_enabled | bool
+    - keystone_sp != {}
 
 - name: Install developer mode apt packages
   apt:

tasks/main.yml

@@ -86,6 +86,7 @@
   tags:
     - keystone-install
     - keystone-config
+  when: keystone_apache_mod_wsgi_enabled | bool
 
 - name: Flush handlers
   meta: flush_handlers

vars/ubuntu-14.04.yml

@@ -15,14 +15,11 @@
 
 # Common apt packages
 keystone_apt_packages:
-  - apache2
-  - apache2-utils
   - debhelper
   - dh-apparmor
   - docutils-common
   - git
   - libffi-dev
-  - libapache2-mod-wsgi
   - libjs-sphinxdoc
   - libjs-underscore
   - libldap2-dev
@@ -39,3 +36,8 @@ keystone_idp_apt_packages:
 
 keystone_developer_apt_packages:
   - build-essential
+
+keystone_apache_apt_packages:
+  - apache2
+  - apache2-utils
+  - libapache2-mod-wsgi

vars/ubuntu-16.04.yml

@@ -15,14 +15,11 @@
 
 # Common apt packages
 keystone_apt_packages:
-  - apache2
-  - apache2-utils
   - debhelper
   - dh-apparmor
   - docutils-common
   - git
   - libffi-dev
-  - libapache2-mod-wsgi
   - libjs-sphinxdoc
   - libjs-underscore
   - libldap2-dev
@@ -39,3 +36,8 @@ keystone_idp_apt_packages:
 
 keystone_developer_apt_packages:
   - build-essential
+
+keystone_apache_apt_packages:
+  - apache2
+  - apache2-utils
+  - libapache2-mod-wsgi