swedenconnect/eid-ops
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

control connector version from hiera or rules

Browse source
This commit is contained in:
Leif Johansson 2017-12-11 09:30:13 +01:00
parent 5ebeb8545a
commit da640901da
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
global/overlay/etc/puppet/cosmos-rules.yaml
View file

@ -31,6 +31,7 @@ r1.komreg.net:
sunet_iaas_cloud: sunet_iaas_cloud:
autoupdate: autoupdate:
eidas_connector: eidas_connector:
version: 1.0.5
sunet::frontend::register_sites: sunet::frontend::register_sites:
sites: sites:
'eunode.qa.sveidas.se': 'eunode.qa.sveidas.se':

5
global/overlay/etc/puppet/manifests/cosmos-site.pp
View file

@ -163,7 +163,8 @@ class swamid_pyff_signer {
sunet::exabgp { 'swamid': } 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') $hostname = safe_hiera('eidas_connector_hostname')
$prid_service = safe_hiera('eidas_prid_service') $prid_service = safe_hiera('eidas_prid_service')
$idp_fticks_salt = safe_hiera('idp_fticks_salt',NOT_SET); $idp_fticks_salt = safe_hiera('idp_fticks_salt',NOT_SET);
@ -204,7 +205,7 @@ class eidas_connector {
} -> } ->
sunet::docker_run {'eidas_connector': sunet::docker_run {'eidas_connector':
image => 'docker.sunet.se/eidas-connector', image => 'docker.sunet.se/eidas-connector',
imagetag => '1.0.4', imagetag => $_version,
ports => ['443:8443'], ports => ['443:8443'],
volumes => ['/var/log/eidas-connector:/var/log/eidas-connector', volumes => ['/var/log/eidas-connector:/var/log/eidas-connector',
'/etc/eidas-connector:/etc/eidas-connector'], '/etc/eidas-connector:/etc/eidas-connector'],