library/roles/smartgears: Move the vo context management from the smart_executor role to the smartgears one. Rename variables consequently. See https://support.d4science.org/issues/4736.

This commit is contained in:
Andrea Dell'Amico 2016-07-15 13:36:46 +02:00
parent 78f009ba44
commit a06ab825a4
3 changed files with 19 additions and 17 deletions

View File

@ -6,17 +6,3 @@ smart_executor_name: smart-executor
smart_executor_file: '{{ smart_executor_name }}-{{ smart_executor_version }}.war'
smart_executor_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}/org/gcube/vremanagement/smart-executor/{{ smart_executor_version }}/{{ smart_executor_file }}'
smart_executor_context: '/{{ smart_executor_name }}'
smart_executor_contexts_list:
- ''
- '/BiodiversityLab'
- '/BiOnym'
- '/ScalableDataMining'
# dev has two different contexts
#smart_executor_contexts_list:
# - ''
# - '/devVRE'
# - ''
# - '/NextNext'

View File

@ -32,6 +32,22 @@ smartgears_service_name: 'tomcat-instance-{{ smartgears_http_port }}'
smartgears_loglevel: WARN
smartgears_define_context_vo: False
smartgears_context: '/smart-executor'
smartgears_contexts_list:
- ''
- '/BiodiversityLab'
- '/BiOnym'
- '/ScalableDataMining'
# dev has two different contexts
#smart_executor_contexts_list:
# - ''
# - '/devVRE'
# - ''
# - '/NextNext'
# The iptables rules use this
http_port: '{{ smartgears_http_port }}'

View File

@ -25,10 +25,10 @@
<property name='SmartGearsDistributionBundle' value='UnBundled' />
<property name='SmartGearsDistribution' value='{{ smartgears_distribution_version }}' />
<publication-frequency>60</publication-frequency>
{% if smart_executor_install is defined and smart_executor_install %}
{% if smartgears_define_context_vo %}
<application mode="{{ smartgears_mode }}" context="{{ smart_executor_context }}">
{% for context in smart_executor_contexts_list %}
<application mode="{{ smartgears_mode }}" context="{{ smartgears_context }}">
{% for context in smartgears_contexts_list %}
<scope>/{{ smartgears_infrastructure_name }}/{{ smartgears_vo_name }}{{ context }}</scope>
{% endfor %}
</application>