get proxy_remove working properly

Author: sjpb

ansible/final.yml

@@ -27,4 +27,4 @@
         name: proxy
       vars:
         proxy_state: absent
-      when: proxy_remove | bool == true
+      when: proxy_remove | default(false) | bool == true

environments/common/inventory/group_vars/all/proxy.yml

@@ -13,6 +13,10 @@ proxy_http_address: "{{ (hostvars[groups['squid'].0 | default(None)] | default({
 # port of proxy - override if not using appliance squid group/role:
 proxy_http_port: "{{ squid_http_port }}"
 
+# whether to remove the proxy configuration at the end of Ansible runs:
+# (useful for image build where this should not be captured in the image)
+proxy_remove: false
+
 # full http proxy string - override if the above don't provide enough control:
 proxy_http_proxy: >-
   {% if groups['squid'] | length > 0 %}

environments/common/inventory/group_vars/builder/defaults.yml

@@ -26,3 +26,4 @@ sssd_started: false
 sssd_enabled: false
 slurm_exporter_state: stopped
 appliances_mode: build
+proxy_remove: true