From a7a184e9050edb8181e138bdacb6524c56291d65 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Fri, 12 Apr 2019 15:57:03 +0200 Subject: [PATCH] Image for demw1.komreg.net was added and replaced Berra's ssh key with mine for logging in to the kvm hosts primarily --- global/overlay/etc/puppet/cosmos-rules.yaml | 1 + global/overlay/etc/puppet/modules/eid/manifests/cloudimage.pp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 3dedc8c8..14660c69 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -375,6 +375,7 @@ kvmdemw-fre-3a.komreg.net: description: 'eid deutsche middleware' cpus: '16' memory: '32768' + image_url: 'https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img' monitor-fre-3.komreg.net: autoupdate: diff --git a/global/overlay/etc/puppet/modules/eid/manifests/cloudimage.pp b/global/overlay/etc/puppet/modules/eid/manifests/cloudimage.pp index faa446ed..2f021e66 100644 --- a/global/overlay/etc/puppet/modules/eid/manifests/cloudimage.pp +++ b/global/overlay/etc/puppet/modules/eid/manifests/cloudimage.pp @@ -17,7 +17,7 @@ define eid::cloudimage( String $image_url = 'https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img', ) { # This is a hack, use SSH keys from KVM host? - $_ssh_key = hiera('ssh_authorized_keys')['berra+96E0A9D4'] + $_ssh_key = hiera('ssh_authorized_keys')['mariah+CA747E57'] $cloudimage_ssh_keys = [sprintf('%s %s %s', $_ssh_key['type'], $_ssh_key['key'], $_ssh_key['name'])] sunet::cloudimage { $name: