فهرست منبع

Fix 'recursive loop detected in template string' for upgrading variable.

Andrew Butcher 9 سال پیش
والد
کامیت
79d58eeb6e
3فایلهای تغییر یافته به همراه3 افزوده شده و 6 حذف شده
  1. 1 1
      roles/openshift_cli/meta/main.yml
  2. 2 0
      roles/openshift_docker/defaults/main.yml
  3. 0 5
      roles/openshift_docker/tasks/main.yml

+ 1 - 1
roles/openshift_cli/meta/main.yml

@@ -12,6 +12,6 @@ galaxy_info:
   categories:
   categories:
   - cloud
   - cloud
 dependencies:
 dependencies:
-- { role: openshift_docker, upgrading: "{{ upgrading | default(False) }}" }
+- role: openshift_docker
 - role: openshift_common
 - role: openshift_common
 - role: openshift_cli_facts
 - role: openshift_cli_facts

+ 2 - 0
roles/openshift_docker/defaults/main.yml

@@ -0,0 +1,2 @@
+---
+upgrading: False

+ 0 - 5
roles/openshift_docker/tasks/main.yml

@@ -2,11 +2,6 @@
 # It's important that we don't explicitly pull this image here.  Otherwise we
 # 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
 # could result in upgrading a preinstalled environment.  We'll have to set
 # openshift_image_tag correctly for upgrades.
 # openshift_image_tag correctly for upgrades.
-
-- set_fact:
-    upgrading: False
-  when: upgrading is not defined
-
 - set_fact:
 - set_fact:
     is_containerized: "{{ openshift.common.is_containerized | default(False) | bool }}"
     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
     # Does the host already have an image tag fact, used to determine if it's a new node