Change needed to work with newer filename for the sshkey agnosticd is

creating.

Signed-off-by: John Matthews <jwmatthews@gmail.com>

4.x/create_ocp4_workshop.sh

@@ -15,7 +15,7 @@ fi
 
 pushd .
 cd ${AGNOSTICD_HOME} 
-ansible-playbook ${AGNOSTICD_HOME}/ansible/main.yml -e ACTION="create" -e @${OUR_DIR}/my_vars.yml -e @${OUR_DIR}/ocp4_vars.yml -e @${OUR_DIR}/../secret.yml -e @${OUR_DIR}/../secret.ocp4.yml "$@"
+ansible-playbook ${AGNOSTICD_HOME}/ansible/main.yml -e ACTION="create" -e @${OUR_DIR}/ocp4_vars.yml -e @${OUR_DIR}/my_vars.yml -e @${OUR_DIR}/../secret.yml -e @${OUR_DIR}/../secret.ocp4.yml "$@"
 rc=$?
 popd
 exit ${rc}

4.x/delete_ocp4_workshop.sh

@@ -14,5 +14,5 @@ fi
 
 pushd .
 cd ${AGNOSTICD_HOME}
-ansible-playbook  ./ansible/configs/ocp4-cluster/destroy_env.yml ${OUR_DIR}/../archive_deleted.yml -e ACTION="destroy" -e @${OUR_DIR}/my_vars.yml -e @${OUR_DIR}/ocp4_vars.yml -e @${OUR_DIR}/../secret.yml "$@"
+ansible-playbook  ./ansible/configs/ocp4-cluster/destroy_env.yml ${OUR_DIR}/../archive_deleted.yml -e ACTION="destroy" -e @${OUR_DIR}/ocp4_vars.yml -e @${OUR_DIR}/my_vars.yml -e @${OUR_DIR}/../secret.yml "$@"
 popd

4.x/ocp4_vars.yml

@@ -2,7 +2,11 @@ cloudformation_retries: 0
 env_type: ocp4-cluster
 software_to_deploy: openshift4
 
-ocp4_installer_version: "4.11.36" 
+#
+# Note that there was an issue in earlier 4.11 and 4.12 clusters with AWS:
+# https://access.redhat.com/solutions/7007136
+# Need to have at least:  4.11.36 or 4.12.12
+ocp4_installer_version: "4.12.12" 
 osrelease: "4.6.0"
 
 update_packages: true

README.md

@@ -103,7 +103,6 @@ FIPS is disabled by default.
 ## Virtualenv (optional)
  * Installing Virtualenv
     ```
-    python3 -m pip install --user virtualenv
     python3 -m venv env
     ```
 

workloads/workload.yml

@@ -12,6 +12,9 @@
 
 - hosts: remote
   remote_user: "{{ remote_user|d('ec2-user') }}"
+  vars:
+    ansible_ssh_private_key_file: "{{ output_dir }}/ssh_provision_{{ guid }}"
+    ansible_user: ec2-user
   vars_files:
     - "{{ my_vars_dir | mandatory }}/my_vars.yml"
     - "{{ my_vars_dir | mandatory }}/ocp{{ ocp_version }}_vars.yml"
@@ -89,7 +92,7 @@
       name: "{{ workload_name }}"
     vars:
       ACTION: "{{ action }}"
-      ansible_ssh_private_key_file: "{{ output_dir }}/{{ guid }}key"
+      ansible_ssh_private_key_file: "{{ output_dir }}/ssh_provision_{{ guid }}"
       ansible_user: ec2-user
       playbook_dir: "{{ agnosticd_home }}"
       hosts: remote