Jonathan Rosser 660e62b0e5 Revert "support http/https proxy for discovery url" ... [stable branch policy requiring a backport rather than an 'in branch' revert means that the following revert SHA refers to the parent patch, not to this branch] This reverts commit e8d0ee1b14. 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. conflicts: magnum/drivers/heat/template_def.py Change-Id: I33da19ad6764bedcf15f2a08381063e2471f8991 (cherry picked from commit 79699f23cd) (cherry picked from commit 1c4f8127f1)		2019-07-05 20:02:05 +01:00
..
environments	Support disabling floating IPs in swarm mode	2018-07-10 09:27:07 +00:00
fragments	Run etcd and flanneld in a system container	2018-02-22 12:30:27 +00:00
kubernetes/fragments	Revert "support http/https proxy for discovery url"	2019-07-05 20:02:05 +01:00
swarm/fragments	Add iptables -P FORWARD ACCEPT unit	2019-02-28 09:58:40 +01:00
lb.yaml	Fix LB heat template parameter name	2017-01-23 18:53:02 +09:00
network.yaml	Make private network optional	2017-01-09 20:14:44 +01:00