Merge pull request rhtconsulting#157 from vvaldez/satellite-with-org

Add org parameter to Satellite with user/pass
vvaldez · Jun 22, 2016 · 5fd360e · 5fd360e
2 parents 833753d + 2ac53b8
commit 5fd360e
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/rhc-ose-ansible/roles/subscription-manager/tasks/main.yml b/rhc-ose-ansible/roles/subscription-manager/tasks/main.yml
@@ -77,6 +77,18 @@
   when:
     - not registered
     - rhsm_authentication == "password"
+    - rhsm_org is not defined or rhsm_org is none or rhsm_org|trim == ''
+
+# This can apply to either Hosted or Satellite
+- name: "Register using username, password and organization"
+  command: "/usr/bin/subscription-manager register --username={{ rhsm_username }} --password={{ rhsm_password }} --org={{ rhsm_org }}"
+  no_log: true
+  when:
+    - not registered
+    - rhsm_authentication == "password"
+    - rhsm_org is defined
+    - rhsm_org is not none
+    - rhsm_org|trim != ''
 
 - name: "Auto-attach to Subscription Manager Pool"
   command: "/usr/bin/subscription-manager attach --auto"