From 098ee1a107a08cedb26a83bf21c05b34a77075f6 Mon Sep 17 00:00:00 2001
From: Shayna Atkinson <satkinson@sphericalcowgroup.com>
Date: Fri, 29 Oct 2021 19:18:17 +0000
Subject: [PATCH] Fix ssh key name, gmail app password and Docker versions

ssh key name had .pem attached which needed to be removed. Comanaga training gmail account app password needed to be updated. Docker versions also needed to be updated.
---
 group_vars/all.yml           |  8 ++++----
 roles/training/vars/main.yml | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/group_vars/all.yml b/group_vars/all.yml
index 7600ffb..357f05b 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -26,7 +26,7 @@ r53_hosted_zone: incommon.training
 r53_dns_domain: "comanage.{{ r53_hosted_zone }}"
 
 # key for ssh-ing into training nodes
-training_node_ssh_key_name: "AWS-Trng-1.pem"
+training_node_ssh_key_name: "AWS-Trng-1"
 
 # The full ARN for an X.509 wildcard certificate provisioned by the
 # AWS Certificate Manager for domain *.comanage.incommong.training
@@ -75,8 +75,8 @@ training_node_volume_type: gp2
 training_node_volume_size: 20
 
 # Docker version
-docker_ce_package_version: "5:20.10.8~3-0~debian-bullseye"
-docker_ce_cli_package_version: "5:20.10.8~3-0~debian-bullseye"
-containerd_io_package_version: "1.4.9-1"
+docker_ce_package_version: "5:20.10.9~3-0~debian-bullseye"
+docker_ce_cli_package_version: "5:20.10.9~3-0~debian-bullseye"
+containerd_io_package_version: "1.4.11-1"
 
 
diff --git a/roles/training/vars/main.yml b/roles/training/vars/main.yml
index 6d5b881..78a10ad 100644
--- a/roles/training/vars/main.yml
+++ b/roles/training/vars/main.yml
@@ -3,11 +3,11 @@
    force_update_structure_ldif_file: no
    comanage_registry_email_account_password: !vault |
           $ANSIBLE_VAULT;1.1;AES256
-          36323531383463636232386363643566383636373965393134323832623630356534383035393133
-          6161623330653935323930666433343763353139363964620a656632326164633534393330363863
-          39643030306133626663386536613435633639653561326538356234356338323861343266633333
-          6533333465666632360a373637653963663038323633633233646162633339383635643631393465
-          33643731626135616535383235303134623033633564376261346633613433313561
+          62313330376130303266343831346136633438346234633663653031316234613065396664323766
+          3137643633376232623366323265663263623433353062350a383032313031646561656334353835
+          34616630373764313136666535316637623266656237396566336239646566336466316265383230
+          3830313938376430310a666466663232353264353861643932646562663335633064623635373664
+          33313433323333633037653131623839366636373562636661366537613133316436
    shibboleth_sp_encrypt_cert: !vault |
           $ANSIBLE_VAULT;1.1;AES256
           37343565666561303437386533663331643131616137353437333865376566346161333764643839