Jonathan Rosser de7b9a6a94 Revert "support http/https proxy for discovery url" ... This reverts commit ffc61816c8. A cherry pick from master is not used here are there are conflicts to resolve in magnum/drivers/heat/template_def.py This commit is reverted for two reasons: * It is undesirable that the end user can inject proxy config into the magnum-conductor service via the cluster template. * The proxy settings for the magnum-conductor service may not be the same as those which are required in the cluster template for the end user VM. Systemd, docker and podman all include native mechanisms for setting environment variables for proecesses, and this should be used by the cloud operator / deployment tooling to configure the required proxy settings for the magnum-conductor service. In particular this patch makes it impossible for the cloud operator to specify their own http_proxy via the environment, the user supplied cluster template setting will always be used. Change-Id: I33da19ad6764bedcf15f2a08381063e2471f8991		2019-06-25 08:46:32 +01:00
..
__init__.py	Refactor driver interface (pt 1)	2016-12-01 09:23:46 -06:00
driver.py	Support <ClusterID>/actions/resize API	2019-03-19 20:13:17 +00:00
k8s_coreos_template_def.py	Improve floating IP allocation	2019-03-20 18:44:45 +13:00
k8s_fedora_template_def.py	[k8s] Add nginx based ingress controller	2019-04-29 12:20:57 +12:00
k8s_template_def.py	Revert "support http/https proxy for discovery url"	2019-06-25 08:46:32 +01:00
swarm_fedora_template_def.py	Revert "support http/https proxy for discovery url"	2019-06-25 08:46:32 +01:00
swarm_mode_template_def.py	Improve floating IP allocation	2019-03-20 18:44:45 +13:00
template_def.py	Revert "support http/https proxy for discovery url"	2019-06-25 08:46:32 +01:00