Merge pull request #6489 from mgugino-upstream-stage/fix-repos-v2

Fix rhel_subscribe boolean

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

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

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

roles/openshift_repos/tasks/main.yaml

@@ -42,7 +42,7 @@
       - ansible_distribution == 'RedHat'
       - deployment_type == 'openshift-enterprise'
       - rhsub_user is defined
-      - rhsub_password is defined
+      - rhsub_pass is defined
 
     - include_tasks: centos_repos.yml
       when: