pw change for spring 2023 training, add match upload file, changed ma…

…tch db pg version, set up VM name to be nodeN rather than registryN
satkinson · Mar 22, 2023 · 568f555 · 568f555
1 parent 46b908c
commit 568f555
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 10 deletions.
diff --git a/group_vars/all.yml b/group_vars/all.yml
@@ -5,11 +5,11 @@
 # ansible-vault encrypt_string 'THE_PASSWORD' --name 'comanage_training_password'
 comanage_training_password: !vault |
           $ANSIBLE_VAULT;1.1;AES256
-          33656532333833346137383432643930376166373039366632303164613038646635383364346266
-          3737363632373433383430356437613733343563363432630a626466313462343332666339313233
-          38366534333864393531663137393832613261333534346666373161646436636430623964303562
-          3162306437373561350a353630653032366262306237386561313366383335626435626264373531
-          6530
+          39336132313462653438613837623964363334316532646639303938353736393365626532363634
+          6664376163323637616463383437356538356438303534340a353630616538643730333330363638
+          30663032323634613537663334613638343031333436333030666131393037316232356539383133
+          3734383064343431340a333431303465346132323332386131613031366537393830633830663137
+          3333
 # It should not be necessary to change the password salt.
 comanage_training_password_salt: !vault |
           $ANSIBLE_VAULT;1.1;AES256

diff --git a/roles/idp/templates/registry-metadata.xml b/roles/idp/templates/registry-metadata.xml
@@ -60,7 +60,7 @@ E+M/1FURO5+w6Q0wIjoraFRnfrBrIKCozNssAvbClcwHuiFuNX8hUmGBnbs7i6KX
 {% for myindex in range(1, lookup('vars', 'training_node_count') + 1, 1) | list %}
             <AssertionConsumerService 
                 Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-		Location="https://registry{{ myindex }}.{{ r53_dns_domain }}/Shibboleth.sso/SAML2/POST" 
+		Location="https://node{{ myindex }}.{{ r53_dns_domain }}/Shibboleth.sso/SAML2/POST" 
                 index="{{ myindex }}"/>
 {% endfor %}
 

diff --git a/roles/training/files/comanage-match-stack.yml b/roles/training/files/comanage-match-stack.yml
@@ -1,9 +1,9 @@
-version: '3.7'
+version: '3.8'
 
 services:
 
     matchdatabase:
-        image: postgres:14.7
+        image: postgres:13.7
         volumes: 
             - /srv/docker/var/lib/postgresql/data:/var/lib/postgresql/data
             - /srv/docker/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d

diff --git a/roles/training/files/upload.csv b/roles/training/files/upload.csv
@@ -0,0 +1,11 @@
+sor,sorid,firstname,lastname,email,firstnamepref,lastnamepref,nationalid,dob
+hrms,N-00001,James,Farmer,James.Farmer@redcurrant.edu,Jamie,Farmer,863-04-0892,1943-02-12
+sis,S-0987,Frank,Farmer,,James,Farmer,,
+hrms,N-00002,Christopher,Key,Christopher.Key@redcurrant.edu,Chris,Key,503-26-0863,
+hrms,N-00003,Luc,Nguyen,Luc.Nguyen@redcurrant.edu,,Nguyen,255-66-3024,
+hrms,N-00004,Frances,Chapman,Frances.Chapman@redcurrant.edu,Frankie,Chapman,275-32-0127,2017-05-03
+hrms,N-00005,Brooke,King,Brooke.King@redcurrant.edu,,King,325-75-5026,
+hrms,N-00006,Miah,Riley,Miah.Riley@redcurrant.edu,,Riely,896-62-3785,
+hrms,N-00007,Isabella,Stokes,Isabella.Stokes@redcurrant.edu,Bella,Stokes,280-78-7615,
+hrms,N-00008,Shannon,Garrison,Shannon.Garrison@redcurrant.edu,,Garrison,702-55-0462,
+hrms,N-00009,Eliana,Carter,Eliana.Carter@redcurrant.edu,,Carter,269-49-0033,
diff --git a/roles/training/tasks/main.yml b/roles/training/tasks/main.yml
@@ -240,3 +240,13 @@
     tags: 
       - update_crontab
 
+  - name: Copy match upload file
+    copy: 
+      src: upload.csv
+      dest: /srv/docker/srv/comanage-match/local/upload.csv
+      owner: root
+      group: root
+      mode: '0644'
+    tags:
+      - update_match_csv 
+
diff --git a/training_nodes.yml b/training_nodes.yml
@@ -49,8 +49,8 @@
             delete_on_termination: yes
         instance_tags:
             Name: "comanage-training-node-{{ item }}"
-            private_fqdn: "registry{{ item }}-private.{{ r53_dns_domain }}"
-            public_fqdn: "registry{{ item }}.{{ r53_dns_domain }}"
+            private_fqdn: "node{{ item }}-private.{{ r53_dns_domain }}"
+            public_fqdn: "node{{ item }}.{{ r53_dns_domain }}"
             comanage_training: True
             role: comanage_registry
         count_tag: