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

This commit is contained in:
Andrea Dell'Amico 2016-09-09 13:33:34 +02:00
parent f864b8648e
commit 18bbc85a22
2 changed files with 39 additions and 50 deletions

View File

@ -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,21 +38,14 @@ smartgears_loglevel: WARN
smartgears_tomcat_contexts: [ 'whn-manager' ]
smartgears_define_context_vo: False
smartgears_define_context_root_vo: True
smartgears_context: '/smart-executor'
smartgears_contexts_list:
- ''
- '/BiodiversityLab'
- '/BiOnym'
- '/ScalableDataMining'
# dev has two different contexts
#smart_executor_contexts_list:
# - ''
# - '/devVRE'
# - ''
# - '/NextNext'
smartgears_define_context_root_vo: False
smartgears_context:
- name: '/smart-executor'
scopes:
- ''
- '/BiodiversityLab'
- '/BiOnym'
- '/ScalableDataMining'
# The iptables rules use this
http_port: '{{ smartgears_http_port }}'

View File

@ -1,48 +1,45 @@
<container mode='{{ smartgears_mode }}'>
<hostname>{{ smartgears_hostname }}</hostname>
{%if setup_nginx %}
{%if https_port is defined %}
<port>{{ https_port }}</port>
{% else %}
<port>{{ http_port }}</port>
{% endif %}
{% else %}
<port>{{ item.http_port }}</port>
{% endif %}
<infrastructure>{{ smartgears_infrastructure_name }}</infrastructure>
{% if smartgears_vo %}
{% for vo_n in smartgears_vo_name %}
<vo>{{ vo_n }}</vo>
{% endfor %}
{% endif %}
{%if setup_nginx %}
{%if https_port is defined %}
<port>{{ https_port }}</port>
{% else %}
<port>{{ http_port }}</port>
{% endif %}
{% else %}
<port>{{ item.http_port }}</port>
{% endif %}
<infrastructure>{{ smartgears_infrastructure_name }}</infrastructure>
{% if smartgears_vo %}
{% for vo_n in smartgears_vo_name %}
<vo>{{ vo_n }}</vo>
{% endfor %}
{% endif %}
<site>
<country>{{ smartgears_country }}</country>
<location>{{ smartgears_location }}</location>
<latitude>{{ smartgears_latitude }}</latitude>
<longitude>{{ smartgears_longitude }}</longitude>
</site>
<site>
<country>{{ smartgears_country }}</country>
<location>{{ smartgears_location }}</location>
<latitude>{{ smartgears_latitude }}</latitude>
<longitude>{{ smartgears_longitude }}</longitude>
</site>
<property name='SmartGearsDistributionBundle' value='UnBundled' />
<property name='SmartGearsDistribution' value='{{ smartgears_distribution_version }}' />
<publication-frequency>60</publication-frequency>
{% if smartgears_define_context_vo %}
<application mode="{{ smartgears_application_mode }}" context="{{ smartgears_context }}">
<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 %}
<application mode="{{ smartgears_application_mode }}" context="{{ context.name }}">
{% 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 %}
<scope>/{{ smartgears_infrastructure_name }}/{{ vo_n }}{{ context }}</scope>
{% for vo_scope in context.scopes %}
<scope>/{{ smartgears_infrastructure_name }}/{{ vo_n }}{{ vo_scope }}</scope>
{% endfor %}
{% endfor %}
</application>
{% endif %}
{% endfor %}
{% endif %}
</container>