From eda42a22637dab0109094f6282a2f289d259f192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= <berra@nordu.net>
Date: Thu, 3 May 2018 09:59:17 +0200
Subject: [PATCH] added mariahs ssh key to hiera

---
 global/overlay/etc/hiera/data/common.yaml         | 15 +++++++++++++++
 .../overlay/etc/puppet/manifests/cosmos-site.pp   | 14 ++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml
index fb540f61..19b7ee58 100644
--- a/global/overlay/etc/hiera/data/common.yaml
+++ b/global/overlay/etc/hiera/data/common.yaml
@@ -10,3 +10,18 @@ nrpe_clients:
    - 109.105.111.111
    - 2001:948:4:6::111
    - 89.45.233.197
+
+ssh_authorized_keys:
+
+  'mariah+CA747E57':
+    ensure: 'present'
+    name:   'mariah+CA747E57@nordu.net'
+    key:    "AAAAB3NzaC1yc2EAAAADAQABAAABAQDLQfL3uYsqjzkKOxn9nhjDHeWdWQ5SRwcPz\
+      q7gINcwJ7omA5c7wJ4RKDqBPihJ9tp2rgM6DKKGxtSyjO6LFhkGNa86uub2PLS0ar+aRobPZ\
+      6sOeASqHbO3S1mmvZZWTQ30AFjtY98jjlvfKEI5Xu1+UKyQJqK+/UBVKlPaW6GMSYLr9Z5Uu\
+      4XS/sBPdL/ZtR95zDO9OKY8OtTufQi8Zy3pl4Q3xcOsSLZrKiEKMYDCLPlxytHD8FDDYLsgi\
+      uPlbF8/uVYYrt/LHHMkD552xC+EjA7Qde1jDU6iHTpttn7j/3FKoxvM8BXUG+QpbqGUESjAl\
+      Az/PMNCUZ0kVYh9eeXr"
+    type:   'ssh-rsa'
+    user:   'root'
+
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 69e1ea9e..7f4ae67e 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -327,6 +327,12 @@ class sunetops {
     sshd_config => $sshd_config,
   }
 
+  # SSH config, create SSH authorized keys from Hiera
+  $ssh_authorized_keys = hiera_hash('ssh_authorized_keys', undef)
+  if is_hash($ssh_authorized_keys) {
+    create_resources('ssh_authorized_key', $ssh_authorized_keys)
+  }
+
   ssh_authorized_key {'leifj+neo':
     ensure  => present,
     name    => 'leifj+neo@mnt.se',
@@ -479,14 +485,6 @@ class sunetops {
     user    => 'root'
   }
 
-  ssh_authorized_key {'mariah+CA747E57':
-    ensure  => present,
-    name    => 'mariah+CA747E57@nordu.net',
-    key     => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDLQfL3uYsqjzkKOxn9nhjDHeWdWQ5SRwcPzq7gINcwJ7omA5c7wJ4RKDqBPihJ9tp2rgM6DKKGxtSyjO6LFhkGNa86uub2PLS0ar+aRobPZ6sOeASqHbO3S1mmvZZWTQ30AFjtY98jjlvfKEI5Xu1+UKyQJqK+/UBVKlPaW6GMSYLr9Z5Uu4XS/sBPdL/ZtR95zDO9OKY8OtTufQi8Zy3pl4Q3xcOsSLZrKiEKMYDCLPlxytHD8FDDYLsgiuPlbF8/uVYYrt/LHHMkD552xC+EjA7Qde1jDU6iHTpttn7j/3FKoxvM8BXUG+QpbqGUESjAlAz/PMNCUZ0kVYh9eeXr',
-    type    => 'ssh-rsa',
-    user    => 'root'
-  }
-
   # OS hardening
   if $::hostname =~ /kvm/ {
     class {'bastion':