revert proxy_tasks_only but make configuring proxy easier

Author: sjpb

ansible/roles/proxy/README.md

@@ -4,9 +4,16 @@ Define http/s proxy configuration.
 
 ## Role variables
 
-- `proxy_http_proxy`: Required. Address of http proxy. E.g. "http://10.1.0.28:3128" for a Squid proxy on default port.
-- `proxy_https_proxy`: Optional. Address of https proxy. Default is `{{ proxy_http_proxy }}`.
-- `proxy_no_proxy_extra`: Optional. List of additional addresses not to proxy. Will be combined with default list which includes `inventory_hostname` (for hostnames) and `ansible_host` (for host IPs) for all Ansible hosts.
-- `proxy_plays_only`: Optional bool. Whether to configure proxying only for Ansible plays (via the [environment](https://docs.ansible.com/ansible/latest/playbook_guide/playbooks_environment.html) keyword). Default `false` which means proxy configuration is written to the host and available to all users. If `true` this role must be run in the playbook for proxying to be available as it sets host facts.
-- `proxy_dnf`: Optional bool. Whether to configure yum/dnf proxying through `proxy_http_proxy`. Default `true`  unless `proxy_plays_only` is `true`.
-- `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` unless `proxy_plays_only` is `true`.
+- `proxy_http_proxy`: Required str. Address of http proxy, e.g. `'http://squid.mysite.org:3128`'.
+  **NB:** If the `squid` group is enabled, this defaults to the address of the
+  first host in that group and the configured port. See `environments/common/inventory/group_vars/all/proxy.yml`
+  for other convenience variables to configure this.
+- `proxy_https_proxy`: Optional string. Address of https proxy. Default is `{{ proxy_http_proxy }}`.
+- `proxy_no_proxy_extra`: Optional list. Additional addresses not to proxy. Will
+  be combined with default list which includes `inventory_hostname` (for hostnames)
+  and `ansible_host` (for host IPs) for all Ansible hosts.
+- `proxy_dnf`: Optional bool. Whether to configure yum/dnf proxying through `proxy_http_proxy`.
+  Default `true`.
+- `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`.

ansible/roles/proxy/defaults/main.yml

@@ -3,6 +3,5 @@ proxy_https_proxy: "{{ proxy_http_proxy }}"
 proxy_no_proxy_defaults: "{{ ['localhost', '127.0.0.1'] + groups['all'] + hostvars.values() | map(attribute='ansible_host') }}"
 proxy_no_proxy_extras: []
 proxy_no_proxy: "{{ (proxy_no_proxy_defaults + proxy_no_proxy_extras) | unique | sort | join(',') }}"
-proxy_plays_only: false
-proxy_dnf: "{{ not proxy_plays_only }}"
-proxy_systemd: "{{ not proxy_plays_only }}"
+proxy_dnf: true
+proxy_systemd: true

ansible/roles/proxy/tasks/main.yml

@@ -9,7 +9,6 @@
     state: present
     regexp: "{{ item.key }}=.*"
     line: "{{ item.key }}={{ item.value }}"
-  when: not proxy_plays_only | bool
   loop:
     - key: http_proxy
       value: "{{ proxy_http_proxy }}"
@@ -64,13 +63,3 @@
 - name: Reset connection to get new /etc/environment
   meta: reset_connection
   # NB: conditionals not supported
-
-- name: Add proxy vars to appliances_environment_vars
-  set_fact:
-    appliances_environment_vars: "{{ appliances_environment_vars | combine(_proxy_vars) }}"
-  vars:
-    _proxy_vars:
-      http_proxy: "{{ proxy_http_proxy }}"
-      https_proxy: "{{ proxy_https_proxy }}"
-      no_proxy: "{{ proxy_no_proxy }}"
-  when: proxy_plays_only | bool