add proxy_remove

Author: sjpb

ansible/final.yml

@@ -17,3 +17,14 @@
     - include_role:
         name: compute_init
         tasks_from: export.yml
+
+- hosts: proxy
+  gather_facts: false
+  tags: proxy
+  become: yes
+  tasks:
+    - include_role:
+        name: proxy
+      vars:
+        proxy_state: absent
+      when: proxy_remove | bool == true

ansible/roles/proxy/README.md

@@ -17,3 +17,6 @@ Define http/s proxy configuration.
 - `proxy_systemd`: Optional bool. Whether to give processes started by systemd
   the above http, https and no_proxy configuration. **NB** Running services will
   need restarting if this is changed. Default `true`.
+- `proxy_remove`: Optional bool. Whether to remove the proxy configuration at
+  the end of the `site.yml` playbook (this is actually a variable on the play,
+  not a role variable).

ansible/roles/proxy/defaults/main.yml

@@ -5,3 +5,5 @@ proxy_no_proxy_extras: []
 proxy_no_proxy: "{{ (proxy_no_proxy_defaults + proxy_no_proxy_extras) | unique | sort | join(',') }}"
 proxy_dnf: true
 proxy_systemd: true
+proxy_state: present
+# proxy_remove: false

ansible/roles/proxy/tasks/main.yml

@@ -1,3 +1,9 @@
+- name: Validate http_proxy definition
+  ansible.builtin.assert:
+    that: proxy_http_proxy != '' # this is default if squid not active
+    fail_msg: >-
+      Variable proxy_http_proxy cannot be the empty string for hosts in the
+      proxy group. See environment/common/inventory/group_vars/all/proxy.yml.
 - name: Define configuration in /etc/environment
   tags: proxy
   lineinfile:
@@ -6,7 +12,7 @@
     owner: root
     group: root
     mode: o=rw,go=r
-    state: present
+    state: "{{ proxy_state }}"
     regexp: "{{ item.key }}=.*"
     line: "{{ item.key }}={{ item.value }}"
   loop:
@@ -24,6 +30,7 @@
     option: "proxy"
     value: "{{ proxy_http_proxy }}"
     no_extra_spaces: true
+    state: "{{ proxy_state }}"
     owner: root
     group: root
     mode: o=rw,go=r
@@ -48,6 +55,7 @@
         "https_proxy={{ proxy_http_proxy }}"
         "no_proxy={{ proxy_no_proxy }}"
     no_extra_spaces: true
+    state: "{{ proxy_state }}"
     owner: root
     group: root
     mode: ug=rw,o=r