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

changed docker version to test

Browse source
This commit is contained in:
Erik Bergström 2018-05-04 14:53:54 +02:00
parent eba2e4fecc
commit 6fb89271a3
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
global/overlay/etc/hiera/data/common.yaml
View file

@ -1,6 +1,7 @@
---
eid_docker_version: '18.03.0~ce-0~ubuntu'
eid_docker_compose_version: '1.15.0'
eid_docker_repo: 'test'
eid_proxy_server: ""
eid_no_proxy: true

2
global/overlay/etc/puppet/modules/eid/manifests/dockerhost.pp
View file

@ -2,7 +2,7 @@
class eid::dockerhost(
String $version = safe_hiera('eid_docker_version'),
String $package_name = hiera('eid_docker_package_name', 'docker-ce'),
Enum['stable', 'edge'] $docker_repo = hiera('eid_docker_repo', 'stable'),
Enum['stable', 'edge', 'test'] $docker_repo = hiera('eid_docker_repo', 'stable'),
String $compose_version = safe_hiera('eid_docker_compose_version'),
String $docker_args = '',
Optional[String] $docker_dns = undef,