From fe801cb7fbf983ef397257117da30ce4ccc938b4 Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Thu, 14 Dec 2017 15:54:45 -0500
Subject: Move repo and subscribe to prerequisites

This commit refactors some steps in rhel subscribe and
moves repos.yml from init/main to prerequisites.
---
 playbooks/byo/rhel_subscribe.yml | 3 ++-
 playbooks/init/main.yml          | 2 --
 playbooks/init/repos.yml         | 4 ++--
 playbooks/prerequisites.yml      | 2 ++
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/byo/rhel_subscribe.yml b/playbooks/byo/rhel_subscribe.yml
index 5a877809a..3cb11a457 100644
--- a/playbooks/byo/rhel_subscribe.yml
+++ b/playbooks/byo/rhel_subscribe.yml
@@ -8,6 +8,7 @@
     when:
     - deployment_type == 'openshift-enterprise'
     - ansible_distribution == "RedHat"
-    - lookup('env', 'rhel_skip_subscription') | default(rhsub_skip, True) | default('no', True) | lower in ['no', 'false']
+    - rhsub_user | default(False)
+    - rhsub_pass | default(False)
   - role: openshift_repos
   - role: os_update_latest
diff --git a/playbooks/init/main.yml b/playbooks/init/main.yml
index b2b972a7d..06e8ba504 100644
--- a/playbooks/init/main.yml
+++ b/playbooks/init/main.yml
@@ -23,8 +23,6 @@
 - import_playbook: validate_hostnames.yml
   when: not (skip_validate_hostnames | default(False))
 
-- import_playbook: repos.yml
-
 - import_playbook: version.yml
   when: not (skip_verison | default(False))
 
diff --git a/playbooks/init/repos.yml b/playbooks/init/repos.yml
index 4967b8f13..048b09e60 100644
--- a/playbooks/init/repos.yml
+++ b/playbooks/init/repos.yml
@@ -9,8 +9,8 @@
     when:
     - ansible_distribution == 'RedHat'
     - deployment_type == 'openshift-enterprise'
-    - (rhel_subscription_user or rhsub_user) is defined
-    - (rhel_subscription_password or rhsub_pass) is defined
+    - rhsub_user | default(False)
+    - rhsub_pass | default(False)
   - name: initialize openshift repos
     include_role:
       name: openshift_repos
diff --git a/playbooks/prerequisites.yml b/playbooks/prerequisites.yml
index 7b7868cfe..5ba62a6d6 100644
--- a/playbooks/prerequisites.yml
+++ b/playbooks/prerequisites.yml
@@ -3,6 +3,8 @@
   vars:
     skip_verison: True
 
+- import_playbook: init/repos.yml
+
 # This is required for container runtime for crio, only needs to run once.
 - name: Configure os_firewall
   hosts: oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config:oo_nfs_to_config:oo_nodes_to_config
-- 
cgit v1.2.3