summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2017-12-18 16:55:33 -0500
committerGitHub <noreply@github.com>2017-12-18 16:55:33 -0500
commitee8592c34d48f9b65b38aab6cfb8f57a4b5edcbd (patch)
tree380746919ff45e2cb1dd8d702bbd9516e8be243a
parent84266ade6839f9a82e3111f12fce64b88a48845a (diff)
parent0c0cdae27567f65e38be4c56d0c2060dc821d156 (diff)
downloadopenshift-ee8592c34d48f9b65b38aab6cfb8f57a4b5edcbd.tar.gz
openshift-ee8592c34d48f9b65b38aab6cfb8f57a4b5edcbd.tar.bz2
openshift-ee8592c34d48f9b65b38aab6cfb8f57a4b5edcbd.tar.xz
openshift-ee8592c34d48f9b65b38aab6cfb8f57a4b5edcbd.zip
Merge pull request #6514 from markllama/osp-add-repos
set repos after registration
-rw-r--r--playbooks/openstack/openshift-cluster/provision.yml14
1 files changed, 11 insertions, 3 deletions
diff --git a/playbooks/openstack/openshift-cluster/provision.yml b/playbooks/openstack/openshift-cluster/provision.yml
index 0a69952df..fa5c91ace 100644
--- a/playbooks/openstack/openshift-cluster/provision.yml
+++ b/playbooks/openstack/openshift-cluster/provision.yml
@@ -47,14 +47,22 @@
hosts: oo_all_hosts
become: yes
gather_facts: yes
- roles:
- - role: rhel_subscribe
+ tasks:
+ - name: Subscribe RHEL instances
+ include_role:
+ name: rhel_subscribe
when:
- ansible_distribution == "RedHat"
- rhsub_user is defined
- rhsub_pass is defined
- tasks:
+ - name: Enable required YUM repositories
+ include_role:
+ name: openshift_repos
+ when:
+ - ansible_distribution == "RedHat"
+ - rh_subscribed is defined
+
- name: Install dependencies
include_role:
name: openshift_openstack