Browse Source

treat force_pull as a bool

bug https://bugzilla.redhat.com/show_bug.cgi?id=1414756
Ben Parees 8 years ago
parent
commit
15203f8f7b

+ 0 - 1
roles/openshift_builddefaults/vars/main.yml

@@ -23,7 +23,6 @@ builddefaults_yaml:
       imageLabels: "{{ openshift_builddefaults_image_labels | default(None) }}"
       nodeSelector: "{{ openshift_builddefaults_nodeselectors | default(None) }}"
       annotations: "{{ openshift_builddefaults_annotations | default(None) }}"
-      #resources: "{{ openshift.builddefaults.resources | default(None) }}"
       resources:
         requests:
           cpu: "{{ openshift_builddefaults_resources_requests_cpu | default(None) }}"

+ 0 - 9
roles/openshift_buildoverrides/tasks/main.yml

@@ -1,13 +1,4 @@
 ---
-#- name: Set buildoverrides
-#  openshift_facts:
-#    role: buildoverrides
-#    local_facts:
-#      force_pull: "{{ openshift_buildoverrides_force_pull | default(None) }}"
-#      image_labels: "{{ openshift_buildoverrides_image_labels | default(None) }}"
-#      nodeselectors: "{{ openshift_buildoverrides_nodeselectors | default(None) }}"
-#      annotations: "{{ openshift_buildoverrides_annotations | default(None) }}"
-
 - name: Set buildoverrides config structure
   openshift_facts:
     role: buildoverrides

+ 2 - 1
roles/openshift_buildoverrides/vars/main.yml

@@ -1,10 +1,11 @@
 ---
+force_pull: "{{ openshift_buildoverrides_force_pull | default('') }}"
 buildoverrides_yaml:
   BuildOverrides:
     configuration:
       apiVersion: v1
       kind: BuildOverridesConfig
-      forcePull: "{{ openshift_buildoverrides_force_pull | default('', true) }}"
+      forcePull: "{{ '' if force_pull == '' else force_pull | bool }}"
       imageLabels: "{{ openshift_buildoverrides_image_labels | default(None) }}"
       nodeSelector: "{{ openshift_buildoverrides_nodeselectors | default(None) }}"
       annotations: "{{ openshift_buildoverrides_annotations | default(None) }}"