The CentOS instance is not deployed to a subdir

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

playbooks/openshift-apps/noggin.yml

@@ -65,6 +65,7 @@
     template: configmap.yml
     objectname: configmap.yml
     noggin_theme: fas
+    subdir: "/accounts"
 
   - role: openshift/ipa-client
     app: noggin
@@ -98,6 +99,7 @@
     app: noggin
     template: deploymentconfig.yml
     objectname: deploymentconfig.yml
+    subdir: "/accounts"
 
   # - role: openshift/start-build
   #   app: noggin

roles/openshift-apps/noggin/templates/deploymentconfig.yml

@@ -69,21 +69,23 @@ spec:
           value: "deploy.wsgi"
         - name: APP_CONFIG
           value: "/etc/noggin/gunicorn.conf.py"
+        {% if subdir %}
         - name: SCRIPT_NAME
-          value: "/accounts"
+          value: "{{ subdir }}"
+        {% endif %}
         readinessProbe:
           timeoutSeconds: 10
           initialDelaySeconds: 5
           periodSeconds: 60
           httpGet:
-            path: /accounts/healthz/ready
+            path: "{{ subdir }}/healthz/ready"
             port: 8080
         livenessProbe:
           timeoutSeconds: 10
           initialDelaySeconds: 10
           periodSeconds: 60
           httpGet:
-            path: /accounts/healthz/live
+            path: "{{ subdir }}/healthz/live"
             port: 8080
       volumes:
       - name: noggin-config-volume

roles/openshift-apps/noggin/templates/noggin.cfg.py

@@ -7,8 +7,10 @@ def from_file(path):
     return open(path, 'r').read().strip()
 
 
+{% if subdir %}
 # Deployed to a subpath
-APPLICATION_ROOT = '/accounts/'
+APPLICATION_ROOT = '{{ subdir }}/'
+{% endif %}
 
 # IPA settings
 FREEIPA_SERVERS = ['{{ ipa_server }}']