diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-05-16 16:17:48 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-05-16 16:18:41 -0400 |
| commit | 79d58eeb6e130e4bfa37f194632c29f9e4ad9156 (patch) | |
| tree | 161f962098d54a4ee68517b524926c207625e0a3 /roles | |
| parent | e3897f7be787ce729d51a150effe0fda9c08a08c (diff) | |
| download | openshift-79d58eeb6e130e4bfa37f194632c29f9e4ad9156.tar.gz openshift-79d58eeb6e130e4bfa37f194632c29f9e4ad9156.tar.bz2 openshift-79d58eeb6e130e4bfa37f194632c29f9e4ad9156.tar.xz openshift-79d58eeb6e130e4bfa37f194632c29f9e4ad9156.zip | |
Fix 'recursive loop detected in template string' for upgrading variable.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_cli/meta/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_docker/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_docker/tasks/main.yml | 5 |
3 files changed, 3 insertions, 6 deletions
diff --git a/roles/openshift_cli/meta/main.yml b/roles/openshift_cli/meta/main.yml index b97a1a277..223cb768d 100644 --- a/roles/openshift_cli/meta/main.yml +++ b/roles/openshift_cli/meta/main.yml @@ -12,6 +12,6 @@ galaxy_info: categories: - cloud dependencies: -- { role: openshift_docker, upgrading: "{{ upgrading | default(False) }}" } +- role: openshift_docker - role: openshift_common - role: openshift_cli_facts diff --git a/roles/openshift_docker/defaults/main.yml b/roles/openshift_docker/defaults/main.yml new file mode 100644 index 000000000..aebef75d6 --- /dev/null +++ b/roles/openshift_docker/defaults/main.yml @@ -0,0 +1,2 @@ +--- +upgrading: False diff --git a/roles/openshift_docker/tasks/main.yml b/roles/openshift_docker/tasks/main.yml index 5d5174ec9..9c5887f76 100644 --- a/roles/openshift_docker/tasks/main.yml +++ b/roles/openshift_docker/tasks/main.yml @@ -2,11 +2,6 @@ # It's important that we don't explicitly pull this image here. Otherwise we # could result in upgrading a preinstalled environment. We'll have to set # openshift_image_tag correctly for upgrades. - -- set_fact: - upgrading: False - when: upgrading is not defined - - set_fact: is_containerized: "{{ openshift.common.is_containerized | default(False) | bool }}" # Does the host already have an image tag fact, used to determine if it's a new node |