diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-10-04 09:45:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-04 09:45:48 -0400 |
| commit | 28f853477a3551b7518b7734e8ac80ca9c27da81 (patch) | |
| tree | 86cecbe676e4939f83c9e0f7efb920ede112f3a7 /roles/openshift_version | |
| parent | a025229edb987afb69d4799c84956821a2c56ecc (diff) | |
| parent | 9461cbf44d75c657ed400324b1cc2c39a2d6b9ff (diff) | |
| download | openshift-28f853477a3551b7518b7734e8ac80ca9c27da81.tar.gz openshift-28f853477a3551b7518b7734e8ac80ca9c27da81.tar.bz2 openshift-28f853477a3551b7518b7734e8ac80ca9c27da81.tar.xz openshift-28f853477a3551b7518b7734e8ac80ca9c27da81.zip | |
Merge pull request #2441 from dgoodwin/34-upgrade-improvements
3.4 Upgrade Improvements
Diffstat (limited to 'roles/openshift_version')
| -rw-r--r-- | roles/openshift_version/meta/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_version/meta/main.yml b/roles/openshift_version/meta/main.yml index 70974da17..37c80c29e 100644 --- a/roles/openshift_version/meta/main.yml +++ b/roles/openshift_version/meta/main.yml @@ -15,4 +15,4 @@ dependencies: - role: openshift_repos - role: openshift_docker_facts - role: docker - when: openshift.common.is_containerized | default(False) | bool + when: openshift.common.is_containerized | default(False) | bool and not skip_docker_role | default(False) | bool |