library/roles/smartgears/smartgears: container.xml can contain scopes for more than one context.

smartgears/smartgears/defaults/main.yml

@@ -31,7 +31,6 @@ smartgears_location: pisa
 smartgears_latitude: 41.9000
 smartgears_longitude: 12.5000
 
-
 smartgears_http_port: 9000
 smartgears_service_name: 'tomcat-instance-{{ smartgears_http_port }}'
 
@@ -39,22 +38,15 @@ smartgears_loglevel: WARN
 
 smartgears_tomcat_contexts: [ 'whn-manager' ]
 smartgears_define_context_vo: False
-smartgears_define_context_root_vo: True
+smartgears_define_context_root_vo: False
-smartgears_context: '/smart-executor'
+smartgears_context:
-smartgears_contexts_list:
+  - name: '/smart-executor'
+    scopes:
       - ''
       - '/BiodiversityLab'
       - '/BiOnym'
       - '/ScalableDataMining'
 
-# dev has two different contexts
-#smart_executor_contexts_list:
-#  - ''
-#  - '/devVRE'
-
-#  - ''
-#  - '/NextNext'
-
 # The iptables rules use this
 http_port: '{{ smartgears_http_port }}'
 

smartgears/smartgears/templates/container.xml.j2

@@ -1,17 +1,16 @@
 <container mode='{{ smartgears_mode }}'>
 
   <hostname>{{ smartgears_hostname }}</hostname>
-{%if setup_nginx %}
+  {%if setup_nginx %}
-{%if https_port is defined %}
+  {%if https_port is defined %}
   <port>{{ https_port }}</port>
-{% else %}
+  {% else %}
   <port>{{ http_port }}</port>
-{% endif %}
+  {% endif %}
-{% else %}
+  {% else %}
   <port>{{ item.http_port }}</port>
-{% endif %}
+  {% endif %}
   <infrastructure>{{ smartgears_infrastructure_name }}</infrastructure>
-
   {% if smartgears_vo %}
   {% for vo_n in smartgears_vo_name %}
   <vo>{{ vo_n }}</vo>
@@ -28,21 +27,19 @@
   <property name='SmartGearsDistributionBundle' value='UnBundled' />
   <property name='SmartGearsDistribution' value='{{ smartgears_distribution_version }}' />
   <publication-frequency>60</publication-frequency>
+  {% if smartgears_define_context_vo %}
+  {% for context in smartgears_context %}
 
-{% if smartgears_define_context_vo %}
+  <application mode="{{ smartgears_application_mode }}" context="{{ context.name }}">
-  <application mode="{{ smartgears_application_mode }}" context="{{ smartgears_context }}">
-
     {% if smartgears_define_context_root_vo %}
     <scope>/{{ smartgears_infrastructure_name }}</scope>
     {% endif %}
-
     {% for vo_n in smartgears_vo_name %}
-    {% for context in smartgears_contexts_list %}
+    {% for vo_scope in context.scopes %}
-    <scope>/{{ smartgears_infrastructure_name }}/{{ vo_n }}{{ context }}</scope>
+    <scope>/{{ smartgears_infrastructure_name }}/{{ vo_n }}{{ vo_scope }}</scope>
     {% endfor %}
     {% endfor %}
-
   </application>
-
+  {% endfor %}
-{% endif %}
+  {% endif %}
 </container>