diff options
Diffstat (limited to 'roles/guest-configure/tasks')
| -rw-r--r-- | roles/guest-configure/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/guest-configure/tasks/rhsm-register.yml | 15 | ||||
| -rw-r--r-- | roles/guest-configure/tasks/undo.yml | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/roles/guest-configure/tasks/main.yml b/roles/guest-configure/tasks/main.yml index 0874b4b..76bf2b1 100644 --- a/roles/guest-configure/tasks/main.yml +++ b/roles/guest-configure/tasks/main.yml @@ -13,7 +13,8 @@ - name: Import Red Hat Subscription Manager task ansible.builtin.import_tasks: rhsm-register.yml - when: (guest_configure_rhsm_username | length > 0) and (guest_configure_rhsm_password | length > 0) + when: ((guest_configure_rhsm_username | length > 0) and (guest_configure_rhsm_password | length > 0)) or + ((guest_configure_rhsm_org_id | length > 0) and (guest_configure_rhsm_activation_key | length > 0)) - name: Import update task ansible.builtin.import_tasks: update.yml diff --git a/roles/guest-configure/tasks/rhsm-register.yml b/roles/guest-configure/tasks/rhsm-register.yml index ad09b17..50af690 100644 --- a/roles/guest-configure/tasks/rhsm-register.yml +++ b/roles/guest-configure/tasks/rhsm-register.yml @@ -1,14 +1,17 @@ -- name: Register guest with Red Hat Subscription Manager (without Activation Key) +- name: Register guest with Red Hat Subscription Manager (username/password) community.general.redhat_subscription: username: "{{ guest_configure_rhsm_username }}" password: "{{ guest_configure_rhsm_password }}" state: present - when: guest_configure_rhsm_activation_key | length == 0 + when: + - (guest_configure_rhsm_username | length > 0) and (guest_configure_rhsm_password | length > 0) + - (guest_configure_rhsm_activation_key | length == 0) and (guest_configure_rhsm_org_id | length == 0) -- name: Register guest with Red Hat Subscription Manager (with Activation Key) +- name: Register guest with Red Hat Subscription Manager (org_id/activation_key) community.general.redhat_subscription: - username: "{{ guest_configure_rhsm_username }}" - password: "{{ guest_configure_rhsm_password }}" + org_id: "{{ guest_configure_rhsm_org_id }}" activationkey: "{{ guest_configure_rhsm_activation_key }}" state: present - when: guest_configure_rhsm_activation_key | length > 0 + when: + - (guest_configure_rhsm_username | length == 0) and (guest_configure_rhsm_password | length == 0) + - (guest_configure_rhsm_activation_key | length > 0) and (guest_configure_rhsm_org_id | length > 0) diff --git a/roles/guest-configure/tasks/undo.yml b/roles/guest-configure/tasks/undo.yml index 22889f1..e01c95e 100644 --- a/roles/guest-configure/tasks/undo.yml +++ b/roles/guest-configure/tasks/undo.yml @@ -1,3 +1,3 @@ - name: Import Red Hat Subscription Manager unregister task ansible.builtin.import_tasks: rhsm-unregister.yml - when: (guest_configure_rhsm_username | length > 0) and (guest_configure_rhsm_password | length > 0) + when: (guest_configure_rhsm_username | length > 0) or (guest_configure_rhsm_org_id | length > 0) |