From c6a1cc03a54c149a8ae05c0c973d614d6082fdbf Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 2 Oct 2016 17:11:14 +0000 Subject: [PATCH] try and fix mdapi01.stg trying to start/restart apache when it does not need it at all --- inventory/group_vars/all | 6 ++++++ inventory/group_vars/mdapi-stg | 4 ++++ roles/mod_wsgi/meta/main.yml | 1 + 3 files changed, 11 insertions(+) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 4af898f35a..c6965372a6 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -186,3 +186,9 @@ openshift_required_images: # docker images required by OSBS for builds fedora_required_images: - "fedora:24" + +# +# say if we want the apache role dependency for mod_wsgi or not +# In some cases we want mod_wsgi and no apache (for python3 httpaio stuff) +# +wsgi_wants_apache: true diff --git a/inventory/group_vars/mdapi-stg b/inventory/group_vars/mdapi-stg index 5ce797fd89..70a76942d7 100644 --- a/inventory/group_vars/mdapi-stg +++ b/inventory/group_vars/mdapi-stg @@ -27,3 +27,7 @@ fedmsg_certs: can_send: - mdapi.repo.update +# +# We do not want apache here, in this case we only want mod_wsgi +# +wsgi_wants_apache: false diff --git a/roles/mod_wsgi/meta/main.yml b/roles/mod_wsgi/meta/main.yml index d43ec2659a..b547bd9fd6 100644 --- a/roles/mod_wsgi/meta/main.yml +++ b/roles/mod_wsgi/meta/main.yml @@ -1,2 +1,3 @@ dependencies: - role: apache + when: wsi_wants_apache is true