diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-12-15 15:38:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-15 15:38:37 -0500 |
| commit | 8b71c2938d278f4418db0fdad1bf6f94585e87c7 (patch) | |
| tree | 5f48fe7fed2267b32a056aeb46940ad5fce41a20 | |
| parent | d96898b3138c4d85ba8e2d8fd34734029697777c (diff) | |
| parent | 34139ef4ef095aaf0be2a9c44e7379731f56a4e7 (diff) | |
| download | openshift-8b71c2938d278f4418db0fdad1bf6f94585e87c7.tar.gz openshift-8b71c2938d278f4418db0fdad1bf6f94585e87c7.tar.bz2 openshift-8b71c2938d278f4418db0fdad1bf6f94585e87c7.tar.xz openshift-8b71c2938d278f4418db0fdad1bf6f94585e87c7.zip | |
Merge pull request #6489 from mgugino-upstream-stage/fix-repos-v2
Fix rhel_subscribe boolean
| -rw-r--r-- | playbooks/byo/rhel_subscribe.yml | 4 | ||||
| -rw-r--r-- | playbooks/init/repos.yml | 4 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/provision.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_repos/tasks/main.yaml | 2 |
4 files changed, 7 insertions, 7 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 diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml index 2ada20767..35206049f 100644 --- a/roles/openshift_repos/tasks/main.yaml +++ b/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: |