From 93727c8cac5e3c6cdc7dc58c3080fa6fa30a19b4 Mon Sep 17 00:00:00 2001
From: Roberto <roberto.cirillo@isti.cnr.it>
Date: Wed, 27 Sep 2017 18:25:48 +0200
Subject: [PATCH] group_vars/fhn_manager_pre/all.yml update version
 inventory/hosts.pre add new vm for fhn-manager
 ../library/isti_vars/isti-global.yml add new voms package
 ../library/roles/egi/voms/tasks/main.yml add force option
 ../library/roles/smartgears/sdi_service/defaults/main.yml update version

---
 egi/voms/defaults/main.yml               | 5 ++++-
 egi/voms/tasks/main.yml                  | 7 ++++---
 smartgears/sdi_service/defaults/main.yml | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/egi/voms/defaults/main.yml b/egi/voms/defaults/main.yml
index 643741d2..335b4c67 100644
--- a/egi/voms/defaults/main.yml
+++ b/egi/voms/defaults/main.yml
@@ -1,7 +1,9 @@
 ---
 # Reference: http://italiangrid.github.io/voms/documentation/voms-clients-guide
 voms_egi_install: True
-voms_egi_repo_key: "http://repository.egi.eu/sw/production/umd/UMD-DEB-PGP-KEY"
+voms_egi_repo_key:
+  - "http://repository.egi.eu/sw/production/umd/UMD-DEB-PGP-KEY"
+  - "https://dist.eugridpma.info/distribution/igtf/current/GPG-KEY-EUGridPMA-RPM-3"
 voms_egi_trustanchors_repo: "deb [arch=amd64] http://repository.egi.eu/sw/production/cas/1/current egi-igtf core"
 voms_base_client_repo: "deb [arch=amd64] http://repository.egi.eu/sw/production/umd/3/debian/ squeeze main"
 voms_updates_client_repo: "deb [arch=amd64] http://repository.egi.eu/sw/production/umd/3/debian/ squeeze-updates main"
@@ -10,6 +12,7 @@ voms_trustanchors_base_directory: /etc/grid-security/vomsdir
 
 voms_fetch_crl_pkgs:
   - fetch-crl
+  - ca-policy-egi-core
 
 voms_client_pkgs:
   - voms-clients3
diff --git a/egi/voms/tasks/main.yml b/egi/voms/tasks/main.yml
index 71a5b2dc..a7d430f7 100644
--- a/egi/voms/tasks/main.yml
+++ b/egi/voms/tasks/main.yml
@@ -1,7 +1,8 @@
 ---
 - block:
     - name: Install the EGI repos key
-      apt_key: url={{ voms_egi_repo_key }} state=present
+      apt_key: url={{ item }} state=present 
+      with_items: '{{ voms_egi_repo_key }}'
 
     - name: Install the egi-trustedanchors repository
       apt_repository: repo='{{ voms_egi_trustanchors_repo }}' state=present filename='egi-trustanchors' update_cache=yes
@@ -13,7 +14,7 @@
       apt_repository: repo='{{ voms_updates_client_repo }}' state=present filename='UMD-3-updates' update_cache=yes
 
     - name: Install the CRL fetcher package
-      apt: pkg={{ item }} state=present
+      apt: pkg={{ item }} state=present force=yes
       with_items: '{{ voms_fetch_crl_pkgs }}'
       
     - name: Install the CRL fetcher package
@@ -31,7 +32,7 @@
       with_items: '{{ voms_trusted_anchors_data }}'
 
     - name: Define the VOMS trusted anchors, lsc version
-      template: src=lsc-gridsecurity-content.j2 dest={{ voms_trustanchors_base_directory }}/{{ item.name }}.lsc
+      template: src=lsc-gridsecurity-content.j2 dest={{ voms_trustanchors_base_directory }}/{{ item.dirname }}/{{ item.name }}.lsc
       with_items: '{{ voms_trusted_anchors_data }}'
       
     - name: Define the VOMS trusted anchors
diff --git a/smartgears/sdi_service/defaults/main.yml b/smartgears/sdi_service/defaults/main.yml
index d24703dd..cc4ce1fb 100644
--- a/smartgears/sdi_service/defaults/main.yml
+++ b/smartgears/sdi_service/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 sdi_service_install: False
 sdi_service_upgrade: False
-sdi_service_version: 1.1.0-4.6.1-152847
+sdi_service_version: 1.1.0-4.6.1-153203
 sdi_service_name: sdi-service
 
 sdi_group_id: org.gcube.spatial.data