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

Merge branch 'master' of gitops.sunet.se:eid-ops

Browse source
This commit is contained in:
Maria Haider 2019-06-14 10:14:06 +02:00
commit b61df2635a
Signed by: mariah
GPG key ID: 7414A760CA747E57
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ eidastest_compose:
- HUB_PORT_4444_TCP_PORT=4444 - HUB_PORT_4444_TCP_PORT=4444
eidastest-testid: eidastest-testid:
image: docker.sunet.se/eidastest-testid:1.1.3 image: docker.sunet.se/eidastest-testid:1.1.4
container_name: eidastest-testid container_name: eidastest-testid
ports: ports:
- "443:8099" - "443:8099"

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

@ -400,10 +400,12 @@ class eidastest($version="1.0.0", $hostname="locahost") {
content => inline_template("<%= @compose.to_yaml %>\n") content => inline_template("<%= @compose.to_yaml %>\n")
} -> } ->
exec { 'launch_test_prod': exec { 'launch_test_prod':
command => "wget --no-check-certificate -qO- https://localhost/testid/prod/execution-interval/7" command => "sleep 60 && wget --no-check-certificate -qO- https://localhost/testid/prod/execution-interval/7",
refreshonly => true
} -> } ->
exec { 'launch_test_qa': exec { 'launch_test_qa':
command => "wget --no-check-certificate -qO- https://localhost/testid/qa/execution-interval/27" command => "sleep 60 && wget --no-check-certificate -qO- https://localhost/testid/qa/execution-interval/17",
refreshonly => true
} }
ensure_resource('class','webserver',{}) ensure_resource('class','webserver',{})
ensure_resource('class','https_server',{}) ensure_resource('class','https_server',{})