ansible: Switch SLES product registrations to use common task

Change-Id: Ide81884d4bf64e61f0d824668455d78235715c71
Signed-off-by: Kienan Stewart <kstewart@efficios.com>

diff --git a/automation/ansible/roles/common/tasks/setup-Suse.yml b/automation/ansible/roles/common/tasks/setup-Suse.yml
index 23b681b9de3332908e58ea33dd5800ced45d5c2e..a35ee7bded4b8a1cc71f701d8b3c28f90daefc80 100644 (file)
--- a/automation/ansible/roles/common/tasks/setup-Suse.yml
+++ b/automation/ansible/roles/common/tasks/setup-Suse.yml
@@ -28,9 +28,12 @@
 
 - name: Connect SLES Repo
   when: ansible_distribution == 'SLES'
-  ansible.builtin.command:
-    argv: ['suseconnect', '-p', "{{item}}/{{ansible_distribution_version}}/{{ansible_architecture}}"]
-  with_items: "{{common_sles_connect_repos}}"
+  include_role:
+    name: suse
+    tasks_from: product
+  loop: "{{common_sles_connect_repos}}"
+  loop_control:
+    loop_var: 'product'
 
 - name: Ensure common patterns are installed.
   zypper: "name={{ common_patterns }} type=pattern state=present update_cache=yes"

diff --git a/automation/ansible/roles/developer/tasks/setup-Suse.yml b/automation/ansible/roles/developer/tasks/setup-Suse.yml
index 1373dff38b595e678e3f9b74e463529b2b50dd5b..bda46e9f438e195975827f88219de9285af56829 100644 (file)
--- a/automation/ansible/roles/developer/tasks/setup-Suse.yml
+++ b/automation/ansible/roles/developer/tasks/setup-Suse.yml
@@ -2,6 +2,9 @@
 
 - name: Activate required products
   when: ansible_distribution == 'SLES'
-  ansible.builtin.command:
-    argv: ['suseconnect', '-p', "{{item}}/{{ansible_distribution_version}}/{{ansible_architecture}}"]
-  with_items: "{{developer_sles_products|default([])}}"
+  include_role:
+    name: suse
+    tasks_from: product
+  loop: "{{developer_sles_products|default([])}}"
+  loop_control:
+    loop_var: 'product'