From c1e21f255dd00bf5d95c2a6a807ae7579974361b Mon Sep 17 00:00:00 2001
From: Don Sizemore <don.sizemore@gmail.com>
Date: Wed, 31 Jul 2024 15:45:16 -0400
Subject: [PATCH] Rocky 94 (#368)

* #366 update-fields has moved up a directory

* updates for rocky 9.4

---------

Co-authored-by: Don Sizemore <don.sizemore@github.com>
---
 ec2/ec2-create-instance.sh       | 6 +++---
 tasks/custom_metadata_blocks.yml | 4 ++--
 tasks/docker.yml                 | 8 +-------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ec2/ec2-create-instance.sh b/ec2/ec2-create-instance.sh
index 1ada920b..67b79f97 100755
--- a/ec2/ec2-create-instance.sh
+++ b/ec2/ec2-create-instance.sh
@@ -8,10 +8,10 @@ BRANCH_DEFAULT="develop"
 PEM_DEFAULT=${HOME}
 VERBOSE_ARG=""
 
-# rocky linux 9.3 official, us-east-1
-#AWS_AMI_DEFAULT='ami-06b7b440778b965d8'
+# rocky linux 9.4 official, us-east-1
+AWS_AMI_DEFAULT='ami-09fb459fad4613d55'
 # let's stick with rocky 8.9 until ITs pass
-AWS_AMI_DEFAULT='ami-0408f4c4a072e3fb9'
+#AWS_AMI_DEFAULT='ami-0408f4c4a072e3fb9'
 
 usage() {
   echo "Usage: $0 -b <branch> -r <repo> -p <pem_path> -g <group_vars> -a <dataverse-ansible branch> -i aws_image -u aws_user -s aws_size -t aws_tag -f aws_security group -e aws_profile -l local_log_path -d -v" 1>&2
diff --git a/tasks/custom_metadata_blocks.yml b/tasks/custom_metadata_blocks.yml
index bf2795d0..fab9c029 100644
--- a/tasks/custom_metadata_blocks.yml
+++ b/tasks/custom_metadata_blocks.yml
@@ -39,14 +39,14 @@
 
 - name: "release case: get develop update-fields.sh from develop"
   ansible.builtin.get_url:
-    url: '{{ dataverse_raw_repo }}/develop/conf/solr/{{ dataverse.solr.version }}/update-fields.sh'
+    url: '{{ dataverse_raw_repo }}/develop/conf/solr/update-fields.sh'
     dest: /tmp/dvinstall/update-fields.sh
     mode: 0755
   when: dataverse_branch == 'release'
 
 - name: "branch case: get develop update-fields.sh from branch"
   ansible.builtin.get_url:
-    url: '{{ dataverse_raw_repo }}/{{ dataverse_branch }}/conf/solr/{{ dataverse.solr.version }}/update-fields.sh'
+    url: '{{ dataverse_raw_repo }}/{{ dataverse_branch }}/conf/solr/update-fields.sh'
     dest: /tmp/dvinstall/update-fields.sh
     mode: 0755
   when: dataverse_branch != 'release'
diff --git a/tasks/docker.yml b/tasks/docker.yml
index cbe4c796..b46ff4d9 100644
--- a/tasks/docker.yml
+++ b/tasks/docker.yml
@@ -13,13 +13,7 @@
 
 - name: Ansible docker module requires python-docker
   ansible.builtin.package:
-    name: 'python3-docker'
-    state: latest
-
-- name: pip must update itself
-  ansible.builtin.pip:
-    name: pip
-    executable: pip3
+    name: ['python3-docker','python3-pip']
     state: latest
 
 - name: and docker-compose python package