summaryrefslogtreecommitdiffstats
path: root/roles/subscription-manager
diff options
context:
space:
mode:
authorEric Sauer <etsauer@gmail.com>2016-06-21 23:46:31 -0400
committerGitHub <noreply@github.com>2016-06-21 23:46:31 -0400
commit03dc869a953767da32b3b9cfd643545dbe035e5d (patch)
treede7d77ba1430830e38625e026a55d5495394680c /roles/subscription-manager
parent4260d67f16c7e37606a559d0ff091aa34244cb3d (diff)
parent305140bfaeb6cd1bbe34279cbd6750d1136816d6 (diff)
downloadopenshift-03dc869a953767da32b3b9cfd643545dbe035e5d.tar.gz
openshift-03dc869a953767da32b3b9cfd643545dbe035e5d.tar.bz2
openshift-03dc869a953767da32b3b9cfd643545dbe035e5d.tar.xz
openshift-03dc869a953767da32b3b9cfd643545dbe035e5d.zip
Merge pull request #157 from vvaldez/satellite-with-org
Add org parameter to Satellite with user/pass
Diffstat (limited to 'roles/subscription-manager')
-rw-r--r--roles/subscription-manager/tasks/main.yml12
1 files changed, 12 insertions, 0 deletions
diff --git a/roles/subscription-manager/tasks/main.yml b/roles/subscription-manager/tasks/main.yml
index c73204a29..0b3aa351f 100644
--- a/roles/subscription-manager/tasks/main.yml
+++ b/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"