diff options
| author | Ben Parees <bparees@redhat.com> | 2017-01-20 13:44:16 -0500 |
|---|---|---|
| committer | Ben Parees <bparees@redhat.com> | 2017-01-23 10:45:04 -0500 |
| commit | 15203f8f7b59f80b849b2b69356baf3d73e9bac5 (patch) | |
| tree | 8153c10eb6e8d1635ec9f764620b41aa62502518 | |
| parent | c995e1273811a24211ccc8a7e31bd793728d0f74 (diff) | |
| download | openshift-15203f8f7b59f80b849b2b69356baf3d73e9bac5.tar.gz openshift-15203f8f7b59f80b849b2b69356baf3d73e9bac5.tar.bz2 openshift-15203f8f7b59f80b849b2b69356baf3d73e9bac5.tar.xz openshift-15203f8f7b59f80b849b2b69356baf3d73e9bac5.zip | |
treat force_pull as a bool
bug https://bugzilla.redhat.com/show_bug.cgi?id=1414756
| -rw-r--r-- | roles/openshift_builddefaults/vars/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_buildoverrides/tasks/main.yml | 9 | ||||
| -rw-r--r-- | roles/openshift_buildoverrides/vars/main.yml | 3 |
3 files changed, 2 insertions, 11 deletions
diff --git a/roles/openshift_builddefaults/vars/main.yml b/roles/openshift_builddefaults/vars/main.yml index c9ec3b82f..fe6069ea9 100644 --- a/roles/openshift_builddefaults/vars/main.yml +++ b/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) }}" diff --git a/roles/openshift_buildoverrides/tasks/main.yml b/roles/openshift_buildoverrides/tasks/main.yml index 82fce1c5b..87d0e6f21 100644 --- a/roles/openshift_buildoverrides/tasks/main.yml +++ b/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 diff --git a/roles/openshift_buildoverrides/vars/main.yml b/roles/openshift_buildoverrides/vars/main.yml index f0f9c255b..cf49a6ebf 100644 --- a/roles/openshift_buildoverrides/vars/main.yml +++ b/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) }}" |