summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-12-15 09:33:28 -0500
committerMichael Gugino <mgugino@redhat.com>2017-12-15 09:33:28 -0500
commit34139ef4ef095aaf0be2a9c44e7379731f56a4e7 (patch)
tree388f65875647452c0806504beb6c62ffa168f282 /playbooks
parent8190c1c8e4f300267405a0628e466167a09d8b59 (diff)
downloadopenshift-34139ef4ef095aaf0be2a9c44e7379731f56a4e7.tar.gz
openshift-34139ef4ef095aaf0be2a9c44e7379731f56a4e7.tar.bz2
openshift-34139ef4ef095aaf0be2a9c44e7379731f56a4e7.tar.xz
openshift-34139ef4ef095aaf0be2a9c44e7379731f56a4e7.zip
Fix rhel_subscribe boolean
This commit fixes a variable name to it's correct name used in a when condition. Also makes use of 'is defined' consistent.
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/byo/rhel_subscribe.yml4
-rw-r--r--playbooks/init/repos.yml4
-rw-r--r--playbooks/openstack/openshift-cluster/provision.yml4
3 files changed, 6 insertions, 6 deletions
diff --git a/playbooks/byo/rhel_subscribe.yml b/playbooks/byo/rhel_subscribe.yml
index 3cb11a457..dc9d0a139 100644
--- a/playbooks/byo/rhel_subscribe.yml
+++ b/playbooks/byo/rhel_subscribe.yml
@@ -8,7 +8,7 @@
when:
- deployment_type == 'openshift-enterprise'
- ansible_distribution == "RedHat"
- - rhsub_user | default(False)
- - rhsub_pass | default(False)
+ - rhsub_user is defined
+ - rhsub_pass is defined
- role: openshift_repos
- role: os_update_latest
diff --git a/playbooks/init/repos.yml b/playbooks/init/repos.yml
index 048b09e60..66786a41a 100644
--- a/playbooks/init/repos.yml
+++ b/playbooks/init/repos.yml
@@ -9,8 +9,8 @@
when:
- ansible_distribution == 'RedHat'
- deployment_type == 'openshift-enterprise'
- - rhsub_user | default(False)
- - rhsub_pass | default(False)
+ - rhsub_user is defined
+ - rhsub_pass is defined
- name: initialize openshift repos
include_role:
name: openshift_repos
diff --git a/playbooks/openstack/openshift-cluster/provision.yml b/playbooks/openstack/openshift-cluster/provision.yml
index 583e72b51..0a69952df 100644
--- a/playbooks/openstack/openshift-cluster/provision.yml
+++ b/playbooks/openstack/openshift-cluster/provision.yml
@@ -51,8 +51,8 @@
- role: rhel_subscribe
when:
- ansible_distribution == "RedHat"
- - rhsub_user | default(False)
- - rhsub_pass | default(False)
+ - rhsub_user is defined
+ - rhsub_pass is defined
tasks:
- name: Install dependencies