summaryrefslogtreecommitdiffstats
path: root/playbooks/init
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks/init')
-rw-r--r--playbooks/init/facts.yml6
-rw-r--r--playbooks/init/repos.yml4
2 files changed, 5 insertions, 5 deletions
diff --git a/playbooks/init/facts.yml b/playbooks/init/facts.yml
index d41f365dc..4d40e472c 100644
--- a/playbooks/init/facts.yml
+++ b/playbooks/init/facts.yml
@@ -69,7 +69,7 @@
- name: assert atomic host docker version is 1.12 or later
assert:
that:
- - l_atomic_docker_version.stdout | replace('"', '') | version_compare('1.12','>=')
+ - l_atomic_docker_version.stdout | replace('"', '') is version_compare('1.12','>=')
msg: Installation on Atomic Host requires Docker 1.12 or later. Please upgrade and restart the Atomic Host.
- when:
@@ -85,7 +85,7 @@
- "{{ 'python3-PyYAML' if ansible_distribution == 'Fedora' else 'PyYAML' }}"
- yum-utils
register: result
- until: result | success
+ until: result is succeeded
- name: Ensure various deps for running system containers are installed
package:
@@ -103,7 +103,7 @@
or (openshift_use_node_system_container | default(False)) | bool
or (openshift_use_master_system_container | default(False)) | bool
register: result
- until: result | success
+ until: result is succeeded
- name: Gather Cluster facts and set is_containerized if needed
openshift_facts:
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