fix: Conform proxy vars (IBM#79)

Proxy variables in all.yaml didn't conform to the "env." standard that
all the other variables use.

Feedback from users said it was confusing and caused some issues.

Signed-off-by: Jacob Emery <jacob.emery@ibm.com>
Signed-off-by: Amadeuds Podvratnik <pod@de.ibm.com>

docs/set-variables-group-vars.md

@@ -148,9 +148,9 @@
 ## 13 - (Optional) Proxy
 **Variable Name** | **Description** | **Example**
 :--- | :--- | :---
-**proxy_env.http_proxy** | (Optional) A proxy URL to use for creating HTTP connections outside the cluster. Will be<br /> used in the install-config and applied to other Ansible hosts unless set otherwise in<br /> no_proxy below. Must follow this pattern: http://username:pswd>@ip:port | http://ocp-admin:Pa$sw0rd@9.72.10.1:80
-**proxy_env.https_proxy** | (Optional) A proxy URL to use for creating HTTPS connections outside the cluster. Will be<br /> used in the install-config and applied to other Ansible hosts unless set otherwise in<br /> no_proxy below. Must follow this pattern: https://username:pswd@ip:port | https://ocp-admin:Pa$sw0rd@9.72.10.1:80  
-**proxy_env.no_proxy** | (Optional) A comma-separated list (no spaces) of destination domain names, IP<br /> addresses, or other network CIDRs to exclude from proxying. When using a<br /> proxy, all necessary IPs and domains for your cluster will be added automatically. See<br /> roles/get_ocp/templates/install-config.yaml.j2 for more details on the template. <br />Preface a domain with . to match subdomains only. For example, .y.com matches<br /> x.y.com, but not y.com. Use * to bypass the proxy for all listed destinations. | example.com,192.168.10.1
+**env.proxy.http** | (Optional) A proxy URL to use for creating HTTP connections outside the cluster. Will be<br /> used in the install-config and applied to other Ansible hosts unless set otherwise in<br /> no_proxy below. Must follow this pattern: http://username:pswd>@ip:port | http://ocp-admin:Pa$sw0rd@9.72.10.1:80
+**env.proxy.https** | (Optional) A proxy URL to use for creating HTTPS connections outside the cluster. Will be<br /> used in the install-config and applied to other Ansible hosts unless set otherwise in<br /> no_proxy below. Must follow this pattern: https://username:pswd@ip:port | https://ocp-admin:Pa$sw0rd@9.72.10.1:80  
+**env.proxy.no** | (Optional) A comma-separated list (no spaces) of destination domain names, IP<br /> addresses, or other network CIDRs to exclude from proxying. When using a<br /> proxy, all necessary IPs and domains for your cluster will be added automatically. See<br /> roles/get_ocp/templates/install-config.yaml.j2 for more details on the template. <br />Preface a domain with . to match subdomains only. For example, .y.com matches<br /> x.y.com, but not y.com. Use * to bypass the proxy for all listed destinations. | example.com,192.168.10.1
 
 ## 14 - (Optional) Misc
 **Variable Name** | **Description** | **Example**

inventories/default/group_vars/all.yaml.template

@@ -171,11 +171,10 @@ env:
     fips: 'false'
 
 # Section 13 - (Optional) Proxy
-
-#proxy_env:
-#  http_proxy: 
-#  https_proxy: 
-#  no_proxy: 
+#  proxy:
+#    http: 
+#    https: 
+#    no: 
 
 # Section 14 - (Optional) Misc
   language: en_US.UTF-8

roles/get_ocp/templates/install-config.yaml.j2

@@ -2,9 +2,9 @@ apiVersion: {{ env.install_config.api_version }}
 baseDomain: {{ env.cluster.networking.base_domain }}
 {% if use_proxy == true %}
 {{ 'proxy: ' }}
-{{ '  httpProxy: ' + proxy_env.http_proxy }}
-{{ '  httpsProxy: ' + proxy_env.https_proxy }}
-{{ '  noProxy: ' + proxy_env.no_proxy + ',' + '127.0.0.1,' + 'localhost,' +
+{{ '  httpProxy: ' + env.proxy.http }}
+{{ '  httpsProxy: ' + env.proxy.https }}
+{{ '  noProxy: ' + env.proxy.no + ',' + '127.0.0.1,' + 'localhost,' +
 env.bastion.networking.ip + ',' +
 env.cluster.nodes.bootstrap.ip + ',' +
 env.cluster.nodes.control.ip|join(',') + ',' +