Container Infrastructure Management Service for OpenStack
Go to file
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
api-ref/source Add API ref for <ClusterID>/actions/resize 2019-03-25 16:35:46 +00:00
contrib Support multi DNS server 2019-04-15 22:10:25 +00:00
devstack Removed admin_* from devstack config 2018-12-20 04:00:07 +00:00
doc [k8s] Add nginx based ingress controller 2019-04-29 12:20:57 +12:00
dockerfiles k8s_fedora: Deploy tiller 2019-02-11 11:18:08 +01:00
etc/magnum Register default magnum service and stat policies in code 2017-10-23 02:57:29 +00:00
magnum Revert "support http/https proxy for discovery url" 2019-06-25 08:46:32 +01:00
playbooks Disable broken image building 2019-05-01 17:02:22 +02:00
releasenotes [k8s] Add nginx based ingress controller 2019-04-29 12:20:57 +12:00
specs Document use of kube_tag label 2018-02-13 13:40:34 +00:00
tools containers: clean-up build code 2018-12-18 19:47:56 -05:00
.coveragerc Cleanup coverage configuration 2016-08-28 21:11:07 +01:00
.gitignore Switch to stestr 2018-07-13 13:05:52 +07:00
.gitreview OpenDev Migration Patch 2019-04-19 19:44:24 +00:00
.mailmap Initial commit from github (squashed) 2014-11-18 09:23:37 -05:00
.stestr.conf Switch to stestr 2018-07-13 13:05:52 +07:00
.testr.conf Remove minion dependency on master 2016-03-04 07:41:12 -05:00
.zuul.yaml Disable broken image building 2019-05-01 17:02:22 +02:00
CONTRIBUTING.rst Workflow documentation is now in infra-manual 2014-12-05 03:30:45 +00:00
HACKING.rst Add a hacking rule for string interpolation at logging 2017-07-15 14:49:45 +08:00
LICENSE Initial commit from github (squashed) 2014-11-18 09:23:37 -05:00
README.rst fix bug link in readme 2018-12-08 17:31:44 +00:00
babel.cfg Initial commit from github (squashed) 2014-11-18 09:23:37 -05:00
bindep.txt Add bindep.txt file 2018-04-20 14:40:19 -04:00
functional_creds.conf.sample Use keystone v3 for functional tests 2016-12-05 15:21:09 +01:00
lower-constraints.txt Add framework for magnum-status upgrade check 2019-01-27 04:26:30 +00:00
requirements.txt Add framework for magnum-status upgrade check 2019-01-27 04:26:30 +00:00
setup.cfg Add framework for magnum-status upgrade check 2019-01-27 04:26:30 +00:00
setup.py Updated from global requirements 2017-03-07 01:58:36 +00:00
test-requirements.txt Switch to stestr 2018-07-13 13:05:52 +07:00
tox.ini Update UPPER_CONSTRAINTS_FILE for stable/stein 2019-03-21 21:38:38 +00:00

README.rst

Team and repository tags

image

Magnum

Magnum is an OpenStack project which offers container orchestration engines for deploying and managing containers as first class resources in OpenStack.

For more information, please refer to the following resources: