diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-05 14:46:23 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-05 14:46:23 -0400 |
| commit | 20365026351eff3a68ce78374ad7afbd447952ab (patch) | |
| tree | b67dddfa41b36636f6a628894b97ccbb719aabd2 /roles/openshift_facts | |
| parent | 9db67b8095b206efefeb2c3def07e1e4394733d0 (diff) | |
| parent | 18b52f2c4ef11b34b248b48ce5ca59d7c5a4f426 (diff) | |
| download | openshift-20365026351eff3a68ce78374ad7afbd447952ab.tar.gz openshift-20365026351eff3a68ce78374ad7afbd447952ab.tar.bz2 openshift-20365026351eff3a68ce78374ad7afbd447952ab.tar.xz openshift-20365026351eff3a68ce78374ad7afbd447952ab.zip | |
Merge pull request #1655 from sdodson/more-docker19
Downgrade to docker 1.8.2 if installing < 1.2/3.2
Diffstat (limited to 'roles/openshift_facts')
| -rw-r--r-- | roles/openshift_facts/tasks/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml index a2eb27fbb..36def57c8 100644 --- a/roles/openshift_facts/tasks/main.yml +++ b/roles/openshift_facts/tasks/main.yml @@ -15,7 +15,7 @@ - set_fact: l_is_atomic: "{{ ostree_output.rc == 0 }}" - set_fact: - l_is_containerized: "{{ l_is_atomic or containerized | default(false) | bool }}" + l_is_containerized: "{{ (l_is_atomic | bool) or (containerized | default(false) | bool) }}" - name: Ensure PyYaml is installed action: "{{ ansible_pkg_mgr }} name=PyYAML state=present" |