From 1c0c502988b0f1d014e5cba7f789d344c56f2d1b Mon Sep 17 00:00:00 2001
From: Tomas Sedovic <tomas@sedovic.cz>
Date: Wed, 29 Nov 2017 11:38:04 +0100
Subject: Optionally subscribe OpenStack RHEL nodes

---
 .../openstack/openshift-cluster/provision.yml      | 10 +++++++++
 .../openstack/sample-inventory/group_vars/all.yml  | 25 ++++------------------
 2 files changed, 14 insertions(+), 21 deletions(-)

(limited to 'playbooks/openstack')

diff --git a/playbooks/openstack/openshift-cluster/provision.yml b/playbooks/openstack/openshift-cluster/provision.yml
index 36d8c8215..1d2680252 100644
--- a/playbooks/openstack/openshift-cluster/provision.yml
+++ b/playbooks/openstack/openshift-cluster/provision.yml
@@ -26,6 +26,9 @@
   - name: Gather facts for the new nodes
     setup:
 
+- name: set common facts
+  include: ../../init/facts.yml
+
 
 # NOTE(shadower): the (internal) DNS must be functional at this point!!
 # That will have happened in provision.yml if nsupdate was configured.
@@ -47,6 +50,13 @@
   hosts: oo_all_hosts
   become: yes
   gather_facts: yes
+  roles:
+  - role: rhel_subscribe
+    when:
+    - ansible_distribution == "RedHat"
+    - lookup('env', 'rhel_subscription_user') | default(rhsub_user | default(False, True), True)
+    - lookup('env', 'rhel_subscription_pass') | default(rhsub_pass | default(False, True), True)
+
   tasks:
   - name: Install dependencies
     include_role:
diff --git a/playbooks/openstack/sample-inventory/group_vars/all.yml b/playbooks/openstack/sample-inventory/group_vars/all.yml
index 921edb867..1019a6b3e 100644
--- a/playbooks/openstack/sample-inventory/group_vars/all.yml
+++ b/playbooks/openstack/sample-inventory/group_vars/all.yml
@@ -86,27 +86,10 @@ openshift_openstack_docker_volume_size: "15"
 
 openshift_openstack_subnet_prefix: "192.168.99"
 
-## Red Hat subscription defaults to false which means we will not attempt to
-## subscribe the nodes
-#rhsm_register: False
-
-# # Using Red Hat Satellite:
-#rhsm_register: True
-#rhsm_satellite: 'sat-6.example.com'
-#rhsm_org: 'OPENSHIFT_ORG'
-#rhsm_activationkey: '<activation-key>'
-
-# # Or using RHN username, password and optionally pool:
-#rhsm_register: True
-#rhsm_username: '<username>'
-#rhsm_password: '<password>'
-#rhsm_pool: '<pool id>'
-
-#rhsm_repos:
-# - "rhel-7-server-rpms"
-# - "rhel-7-server-ose-3.5-rpms"
-# - "rhel-7-server-extras-rpms"
-# - "rhel-7-fast-datapath-rpms"
+## Red Hat subscription:
+#rhsub_user: '<username>'
+#rhsub_pass: '<password>'
+#rhsub_pool: '<pool name>'
 
 
 # # Roll-your-own DNS
-- 
cgit v1.2.1


From bd2335ff8110f507b353fabc40b4a5e0316fc3cb Mon Sep 17 00:00:00 2001
From: Tomas Sedovic <tomas@sedovic.cz>
Date: Fri, 1 Dec 2017 12:23:59 +0100
Subject: Remove shell environment lookup

---
 playbooks/openstack/openshift-cluster/provision.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'playbooks/openstack')

diff --git a/playbooks/openstack/openshift-cluster/provision.yml b/playbooks/openstack/openshift-cluster/provision.yml
index 1d2680252..17357a8db 100644
--- a/playbooks/openstack/openshift-cluster/provision.yml
+++ b/playbooks/openstack/openshift-cluster/provision.yml
@@ -54,8 +54,8 @@
   - role: rhel_subscribe
     when:
     - ansible_distribution == "RedHat"
-    - lookup('env', 'rhel_subscription_user') | default(rhsub_user | default(False, True), True)
-    - lookup('env', 'rhel_subscription_pass') | default(rhsub_pass | default(False, True), True)
+    - rhsub_user | default(False)
+    - rhsub_pass | default(False)
 
   tasks:
   - name: Install dependencies
-- 
cgit v1.2.1