fixing rhsm

2026-02-05 09:45:58 +01:00 · 2018-05-02 12:11:00 -07:00
parent 37e15e2db9
commit b9f06df6a5
1 changed files with 0 additions and 6 deletions
--- a/roles/rhsm/tasks/main.yaml
+++ b/roles/rhsm/tasks/main.yaml
@@ -39,16 +39,10 @@
    - name: Register system using Red Hat Subscription Manager
      redhat_subscription:
        state: present
-<<<<<<< HEAD
        username: "{{ rhsub_user | default(omit) }}"
        password: "{{ rhsub_pass | default(omit) }}"
        pool: "{{ rhsub_pool | default(omit) }}"
-=======
-        username: "{{ rhsm_user | default(omit) }}"
-        password: "{{ rhsm_password | default(omit) }}"
-        pool: "{{ rhsm_pool | default(omit) }}"
        server_hostname: "{{ rhsm_satellite | default(omit) }}"
->>>>>>> 33b57b9c6fc27710b494e19585729a66f7f5bddd
      when:
        - "'not registered' in subscribed.stdout"
        - rhsub_user is defined