library/roles/solr-tomcat-instance/tasks/main.yml: Add some labels.

library/roles/ckan/ckan-solr/tasks/main.yml: Add some labels.
d4science-ghn-cluster/group_vars/ckan*: Fix the definitions for the new CKAN GRSF instance.
This commit is contained in:
Andrea Dell'Amico 2016-09-20 15:53:44 +02:00
parent 2f8f9e1d26
commit 309bf1e15c
2 changed files with 8 additions and 8 deletions

View File

@ -4,11 +4,11 @@
with_items: '{{ solr_cores }}' with_items: '{{ solr_cores }}'
when: not ckan_geonetwork_harvester when: not ckan_geonetwork_harvester
notify: Solr Restart notify: Solr Restart
tags: [ 'ckan', 'solr', 'solr_schema' ] tags: [ 'ckan', 'solr', 'solr_schema', 'solr_core' ]
- name: Install the solr schema used by CKAN, modified with the spatial fields - name: Install the solr schema used by CKAN, modified with the spatial fields
copy: src=schema.xml dest={{ solr_collections_base_dir }}/{{ item }}/conf/schema.xml force=yes copy: src=schema.xml dest={{ solr_collections_base_dir }}/{{ item }}/conf/schema.xml force=yes
with_items: '{{ solr_cores }}' with_items: '{{ solr_cores }}'
when: ckan_geonetwork_harvester when: ckan_geonetwork_harvester
notify: Solr Restart notify: Solr Restart
tags: [ 'ckan', 'solr', 'solr_schema' ] tags: [ 'ckan', 'solr', 'solr_schema', 'solr_core' ]

View File

@ -49,7 +49,7 @@
with_items: with_items:
- collection1.tar.gz - collection1.tar.gz
- solr_core_base.tar.gz - solr_core_base.tar.gz
tags: [ solr, tomcat ] tags: [ solr, tomcat, solr_core ]
- name: Install the solr collection1 example - name: Install the solr collection1 example
unarchive: src={{ solr_data_dir }}/collection_data/collection1.tar.gz dest={{ solr_collections_base_dir }} copy=no unarchive: src={{ solr_data_dir }}/collection_data/collection1.tar.gz dest={{ solr_collections_base_dir }} copy=no
@ -57,13 +57,13 @@
creates: '{{ solr_data_dir }}/data/solr/collection1/conf/solrconfig.xml' creates: '{{ solr_data_dir }}/data/solr/collection1/conf/solrconfig.xml'
when: solr_install_collection1 when: solr_install_collection1
notify: tomcat solr restart notify: tomcat solr restart
tags: [ solr, tomcat ] tags: [ solr, tomcat, solr_core ]
- name: Create the solr cores data directories - name: Create the solr cores data directories
file: dest={{ solr_collections_base_dir }}/{{ item }} state=directory owner={{ solr_user }} group={{ solr_user }} file: dest={{ solr_collections_base_dir }}/{{ item }} state=directory owner={{ solr_user }} group={{ solr_user }}
with_items: '{{ solr_cores }}' with_items: '{{ solr_cores }}'
when: solr_multicore is defined and solr_multicore when: solr_multicore is defined and solr_multicore
tags: [ solr, tomcat ] tags: [ solr, tomcat, solr_core ]
- name: Install the solr cores data on a multicore system - name: Install the solr cores data on a multicore system
unarchive: src={{ solr_data_dir }}/collection_data/solr_core_base.tar.gz dest={{ solr_data_dir }}/data/solr/{{ item }} copy=no unarchive: src={{ solr_data_dir }}/collection_data/solr_core_base.tar.gz dest={{ solr_data_dir }}/data/solr/{{ item }} copy=no
@ -72,11 +72,11 @@
with_items: '{{ solr_cores }}' with_items: '{{ solr_cores }}'
when: solr_multicore is defined and solr_multicore when: solr_multicore is defined and solr_multicore
notify: tomcat solr restart notify: tomcat solr restart
tags: [ solr, tomcat ] tags: [ solr, tomcat, solr_core ]
- name: Fix the cores permissions - name: Fix the cores permissions
file: path={{ solr_collections_base_dir }} owner={{ solr_user }} group={{ solr_user }} recurse=yes file: path={{ solr_collections_base_dir }} owner={{ solr_user }} group={{ solr_user }} recurse=yes
tags: [ solr, tomcat ] tags: [ solr, tomcat, solr_core ]
- name: Install the tomcat.local default file - name: Install the tomcat.local default file
template: src={{ item }}.j2 dest=/etc/default/tomcat-instance-{{ solr_http_port }}.local owner=root group={{ solr_user }} mode=0440 template: src={{ item }}.j2 dest=/etc/default/tomcat-instance-{{ solr_http_port }}.local owner=root group={{ solr_user }} mode=0440
@ -91,5 +91,5 @@
- solr.xml - solr.xml
- zoo.cfg - zoo.cfg
notify: tomcat solr restart notify: tomcat solr restart
tags: [ solr, tomcat ] tags: [ solr, tomcat, solr_core ]