From 1c0c502988b0f1d014e5cba7f789d344c56f2d1b Mon Sep 17 00:00:00 2001 From: Tomas Sedovic Date: Wed, 29 Nov 2017 11:38:04 +0100 Subject: Optionally subscribe OpenStack RHEL nodes --- playbooks/openstack/openshift-cluster/provision.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'playbooks/openstack/openshift-cluster/provision.yml') 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: -- cgit v1.2.3 From bd2335ff8110f507b353fabc40b4a5e0316fc3cb Mon Sep 17 00:00:00 2001 From: Tomas Sedovic 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/openshift-cluster/provision.yml') 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.3