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

move hostname and country parameters to hiera

Browse source
This commit is contained in:
Leif Johansson 2017-10-27 16:22:09 +02:00
parent 14d729edff
commit 7c761d9f02
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eidas-node-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml Normal file
View file

@ -0,0 +1,2 @@
---
eidas_connector_hostname=eunode.qa.sveidas.se

3
eidas-proxy-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml Normal file
View file

@ -0,0 +1,3 @@
---
eidas_proxy_hostname=xy.proxy.qa.sveidas.se
eidas_proxy_country=xy

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

@ -20,11 +20,10 @@ r1.komreg.net:
openstack_ubuntu_16_04_dockerhost:
sunet_iaas_cloud:
autoupdate:
eidas_connector:
'^eidas-proxy-[0-9]+\.qa\.sveidas\.se$':
openstack_ubuntu_16_04_dockerhost:
sunet_iaas_cloud:
autoupdate:
eidas_proxy:
hostname: xy.qa.sveidas.se
country: xy

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

@ -197,7 +197,8 @@ class swamid_pyff_signer {
sunet::exabgp { 'swamid': }
}
class eidas_connector($hostname) {
class eidas_connector {
$hostname = safe_hiera('eidas_connector_hostname')
$idp_fticks_salt = safe_hiera('idp_fticks_salt',NOT_SET);
file {['/etc/eidas-connector','/var/log/eidas-connector']: ensure => directory } ->
sunet::docker_run {'eidas_connector':
@ -212,7 +213,9 @@ class eidas_connector($hostname) {
class {'https_server': }
}
class eidas_proxy($hostname,$country) {
class eidas_proxy {
$hostname = safe_hiera('eidas_proxy_hostname');
$country = safe_hiera('eidas_proxy_country');
$proxy_service_cookie_encrypt_pw = safe_hiera('proxy_service_cookie_encrypt_pw',NOT_SET);
file {['/etc/eidas-proxy/',"/etc/eidas-proxy/$country"]: ensure => directory } ->
sunet::snippets::secret_file {"/etc/eidas-proxy/$country/nodeKeyStore.jks":