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/init/main.yml | 2 --
playbooks/init/repos.yml | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
(limited to 'playbooks/init')
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
--
cgit v1.2.3