Use matrix.image properly

outsideopen · Jun 7, 2024 · 9055c75 · 9055c75
1 parent 3a97528
commit 9055c75
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -22,10 +22,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        config:
-          - image: amazonlinux2
-          - image: ubuntu2204
-          - image: rockylinux8
+        image:
+          - amazonlinux2
+          - ubuntu2204
+          - rockylinux8
     steps:
       - name: checkout
         uses: actions/checkout@v4

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -4,4 +4,6 @@ bigfix_client_server_name: bigfix.example.com
 bigfix_client_server_port: 52311
 bigfix_client_service_name: besclient
 
+bigfix_client_masthead_url: "http://{{ bigfix_client_server_name }}:{{ bigfix_client_server_port }}/masthead/masthead.afxm"
+
 __bigfix_ansible_distro_arch: "{{ ansible_distribution_version.split('.')[0] }}-{{ ansible_architecture }}"
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -29,8 +29,8 @@
 - name: Download masthead from BigFix Server
   when: not masthead_file.stat.exists
   ansible.builtin.get_url:
-    url: "http://{{ bigfix_client_server_name }}:{{ bigfix_client_server_port }}/masthead/masthead.afxm"
+    url: "{{ bigfix_client_masthead_url }}"
     dest: "{{ bigfix_client_conf_dir }}/actionsite.afxm"
-    mode: "0644"
+    mode: "644"
   notify:
     - Restart bigfix-client