Merge pull request #620 from ministryofjustice/dso-2320/ami-build-pip…

…eline-fix-rhel6 Dso 2320/ami build pipeline fix rhel6
ministryofjustice · Nov 8, 2023 · e56b8d0 · e56b8d0
2 parents 9be4b68 + 564eecd
commit e56b8d0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/ansible/requirements.rhel6.yml b/ansible/requirements.rhel6.yml
@@ -0,0 +1,18 @@
+# from Galaxy
+roles:
+  - name: mindpointgroup.stig_rhel6
+    version: 0.9.7
+
+collections:
+  - name: community.general
+    source: https://old-galaxy.ansible.com
+    version: 3.7.0
+  - name: amazon.aws
+    source: https://old-galaxy.ansible.com
+    version: 3.2.0
+  - name: community.aws
+    source: https://old-galaxy.ansible.com
+    version: 3.2.1
+  - name: ansible.posix
+    source: https://galaxy.ansible.com
+    version: 1.4.0
diff --git a/commonimages/base/components/rhel_6_10/stig_rhel6_ansible.yml.tftpl b/commonimages/base/components/rhel_6_10/stig_rhel6_ansible.yml.tftpl
@@ -66,8 +66,8 @@ phases:
                 # install requirements in virtual env
                 cd $ansible_dir/$repo/ansible
                 $python -m pip install -r requirements.txt
-                ansible-galaxy role install -r requirements.yml
-                ansible-galaxy collection install -r requirements.yml --force
+                ansible-galaxy role install -r requirements.rhel6.yml
+                ansible-galaxy collection install -r requirements.rhel6.yml --force
 
                 # run ansible (note comma after localhost is deliberate)
                 ansible-playbook -v playbooks/stig_rhel6.yml \

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.2.1"
+configuration_version = "0.2.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
@@ -5,7 +5,7 @@ schemaVersion: 1.0
 parameters:
   - Version:
       type: string
-      default: 0.0.6
+      default: 0.0.7
       description: "Component version, increment if you make changes."
   - Platform:
       type: string