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

bump docker-ce version and restructure

Browse source
This commit is contained in:
Leif Johansson 2018-02-23 15:30:56 +01:00
parent 322bf6b63f
commit 8fbc99ff2f
2 changed files with 7 additions and 7 deletions
global/overlay/etc/puppet
cosmos-rules.yaml
manifests
cosmos-site.pp

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

@ -23,6 +23,7 @@ r1.komreg.net:
sunet_iaas_cloud: sunet_iaas_cloud:
autoupdate: autoupdate:
sunet::dehydrated: sunet::dehydrated:
openstack_dockerhost:
md_repo_server: md_repo_server:
hostname: r1.komreg.net hostname: r1.komreg.net
@ -42,7 +43,7 @@ p1.komreg.net:
'^md[\-0-9].+\.komreg\.net$': '^md[\-0-9].+\.komreg\.net$':
sunet_iaas_cloud: sunet_iaas_cloud:
autoupdate: autoupdate:
openstack_ubuntu_16_04_dockerhost: openstack_dockerhost:
konsulter: konsulter:
md_repo_client: md_repo_client:
@ -52,7 +53,7 @@ md1.komreg.net:
dest_host: p1.komreg.net dest_host: p1.komreg.net
'^eidas-node-[0-9]+\.qa\.sveidas\.se$': '^eidas-node-[0-9]+\.qa\.sveidas\.se$':
openstack_ubuntu_16_04_dockerhost: openstack_dockerhost:
konsulter: konsulter:
sunet_iaas_cloud: sunet_iaas_cloud:
autoupdate: autoupdate:
@ -67,7 +68,7 @@ md1.komreg.net:
port: '443' port: '443'
'^eidas-proxy-[0-9]+\.qa\.sveidas\.se$': '^eidas-proxy-[0-9]+\.qa\.sveidas\.se$':
openstack_ubuntu_16_04_dockerhost: openstack_dockerhost:
konsulter: konsulter:
sunet_iaas_cloud: sunet_iaas_cloud:
autoupdate: autoupdate:
@ -83,7 +84,7 @@ md1.komreg.net:
port: '443' port: '443'
'^prid-[0-9]+\.qa\.sveidas\.se$': '^prid-[0-9]+\.qa\.sveidas\.se$':
openstack_ubuntu_16_04_dockerhost: openstack_dockerhost:
konsulter: konsulter:
sunet_iaas_cloud: sunet_iaas_cloud:
autoupdate: autoupdate:

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

@ -51,9 +51,9 @@ class entropyclient {
sunet::nagios::nrpe_check_process { 'haveged': } sunet::nagios::nrpe_check_process { 'haveged': }
} }
class openstack_ubuntu_16_04_dockerhost { class openstack_dockerhost {
class { 'sunet::dockerhost': class { 'sunet::dockerhost':
docker_version => '17.11.0~ce-0~ubuntu', docker_version => '17.12.0~ce-0~ubuntu',
docker_package_name => 'docker-ce', docker_package_name => 'docker-ce',
storage_driver => "aufs", storage_driver => "aufs",
run_docker_cleanup => true, run_docker_cleanup => true,
@ -192,7 +192,6 @@ class md_publisher(Array $allow_clients=['any'], $keyname=undef, String $dir="/v
} }
class md_repo_server($hostname) { class md_repo_server($hostname) {
class {'openstack_ubuntu_16_04_dockerhost': } ->
class {'sunet::gitolite': } -> class {'sunet::gitolite': } ->
sunet::docker_run {'gitweb': sunet::docker_run {'gitweb':
image => 'docker.sunet.se/gitweb', image => 'docker.sunet.se/gitweb',