cope with rhel 6 issues in components

ministryofjustice · Apr 5, 2024 · c443836 · c443836
1 parent ce86457
commit c443836
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/commonimages/base/rhel_6_10/locals.tf b/commonimages/base/rhel_6_10/locals.tf
@@ -12,7 +12,7 @@ locals {
       parameters = []
       }, {
       name    = "ansible"
-      version = "0.0.13" # set to last known working ansible component version
+      version = "0.0.14" # set to last known working ansible component version
       parameters = [{
         name  = "Ami"
         value = join("_", [var.ami_name_prefix, var.ami_base_name])

diff --git a/commonimages/base/rhel_6_10/terraform.tfvars b/commonimages/base/rhel_6_10/terraform.tfvars
@@ -2,7 +2,7 @@
 # BRANCH_NAME =
 # GH_ACTOR_NAME =
 
-configuration_version = "0.3.1"
+configuration_version = "0.3.2"
 description           = "shared rhel 6.10 base image"
 
 ami_base_name = "rhel_6_10"

diff --git a/commonimages/components/templates/ansible.yml b/commonimages/components/templates/ansible.yml
@@ -107,11 +107,13 @@ phases:
                 cd $ansible_dir/$repo/$ansible_repo_dir
                 if [[ "$python" =~ 3.6 ]]; then
                   $python -m pip install -r requirements.txt -c constraints.rhel6.txt
+                  ansible-galaxy role install -r requirements.rhel6.yml
+                  ansible-galaxy collection install -r requirements.rhel6.yml --force
                 else
                   $python -m pip install -r requirements.txt
+                  ansible-galaxy role install -r requirements.yml
+                  ansible-galaxy collection install -r requirements.yml --force
                 fi
-                ansible-galaxy role install -r requirements.yml
-                ansible-galaxy collection install -r requirements.yml --force
 
                 # run ansible (note comma after localhost is deliberate)
                 ansible-playbook site.yml \