From da640901da745b594e80c5ceaf525dc3825d39f3 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Mon, 11 Dec 2017 09:30:13 +0100
Subject: [PATCH] control connector version from hiera or rules

---
 global/overlay/etc/puppet/cosmos-rules.yaml        | 1 +
 global/overlay/etc/puppet/manifests/cosmos-site.pp | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index f0d8f658..942d3fa0 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -31,6 +31,7 @@ r1.komreg.net:
    sunet_iaas_cloud:
    autoupdate:
    eidas_connector:
+     version: 1.0.5
    sunet::frontend::register_sites:
      sites:
        'eunode.qa.sveidas.se':
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 5a764703..e98ddff3 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -163,7 +163,8 @@ class swamid_pyff_signer {
    sunet::exabgp { 'swamid': }
 }
 
-class eidas_connector {
+class eidas_connector($version="1.0.5") {
+   $_version = safe_hiera('eidas_connector_version',$version)
    $hostname = safe_hiera('eidas_connector_hostname')
    $prid_service = safe_hiera('eidas_prid_service')
    $idp_fticks_salt = safe_hiera('idp_fticks_salt',NOT_SET);
@@ -204,7 +205,7 @@ class eidas_connector {
    } ->
    sunet::docker_run {'eidas_connector':
       image    => 'docker.sunet.se/eidas-connector',
-      imagetag => '1.0.4',
+      imagetag => $_version,
       ports    => ['443:8443'],
       volumes  => ['/var/log/eidas-connector:/var/log/eidas-connector',
                    '/etc/eidas-connector:/etc/eidas-connector'],