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

remove keys and cleanup non-used dockerhost classes

Browse source
This commit is contained in:
Leif Johansson 2017-11-30 20:58:23 +01:00
parent 47d577e0ec
commit 778054f141
1 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,32 +61,6 @@ class openstack_ubuntu_16_04_dockerhost {
}
}
# ONLY to be used for those that start containers with --net host.
# The only difference from openstack_ubuntu_16_04_dockerhost is that
# this class has docker_dns set to 127.0.0.1
class openstack_ubuntu_16_04_dockerhost_net_host {
class { 'sunet::dockerhost':
docker_version => "17.03.0~ce-0~ubuntu-${::lsbdistcodename}",
storage_driver => "aufs",
run_docker_cleanup => true,
manage_dockerhost_unbound => true,
docker_dns => '127.0.0.1'
}
}
# The only difference from openstack_ubuntu_16_04_dockerhost is that
# this class uses a eduix specific registry.
class openstack_ubuntu_16_04_dockerhost_eduix {
class { 'sunet::dockerhost':
docker_version => "17.03.0~ce-0~ubuntu-${::lsbdistcodename}",
storage_driver => "aufs",
run_docker_cleanup => true,
manage_dockerhost_unbound => true,
docker_dns => '172.17.0.1',
docker_extra_parameters => '--insecure-registry registry.lab.eduix.fi'
}
}
class sunet_iaas_cloud {
sunet::cloud_init::config { 'disable_datasources':
config => { datasource_list => [ 'None' ] }
@ -372,7 +346,7 @@ class sunetops {
}
ssh_authorized_key {'patrik+soft':
ensure => present,
ensure => absent,
name => 'patrik@nordu.net',
key => 'AAAAB3NzaC1yc2EAAAABIwAAAQEAs0nFlZmXga5A789gFwmRVYREPNuaGvZBNAkN+fHpfzNfxSDQNlu1v4OWlU2QAs4XBMVIo5O14EuqqunSgFnX1gh9++AM1cQ8pBUeTi0l99MTl7qxc9MIHCyvHhbzra7o3MHEUuNQzbAjEUsuGV5/ymNJv4ysbncX+BiZplkydq2H/MuDQD8dzghfq6HUgf/BZDVxM3K4Ak8ll65PPPA6xnWJA4a2abgHvoBf40R6xF2dgOK3wq4xQRQSUWdw0olRSyXXZ68mt45m9fvwLnpY3xIFWEWJ6ZbEW+K8BsVT7zqbCBdpnfT8Rc2myz3cjgf7WpTHd8JXEcKk2BaEGD4y+w==',
type => 'ssh-rsa',