openstack/charm-neutron-api
Code Issues Proposed changes

Get http_proxy from AMULET_HTTP_PROXY env var

Browse Source
This commit is contained in:
Corey Bryant 2015-04-13 12:10:28 +00:00
parent 98ab277b54
commit 03bdfbae23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/basic_deployment.py
View File

@ -1,6 +1,7 @@
#!/usr/bin/python #!/usr/bin/python
import amulet import amulet
import os
import yaml import yaml
from charmhelpers.contrib.openstack.amulet.deployment import ( from charmhelpers.contrib.openstack.amulet.deployment import (
@ -71,6 +72,7 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
neutron_api_config = {} neutron_api_config = {}
if self.git: if self.git:
branch = 'stable/' + self._get_openstack_release_string() branch = 'stable/' + self._get_openstack_release_string()
amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
openstack_origin_git = { openstack_origin_git = {
'repositories': [ 'repositories': [
{'name': 'requirements', {'name': 'requirements',
@ -81,8 +83,8 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
'branch': branch}, 'branch': branch},
], ],
'directory': '/mnt/openstack-git', 'directory': '/mnt/openstack-git',
'http_proxy': 'http://squid.internal:3128', 'http_proxy': amulet_http_proxy,
'https_proxy': 'https://squid.internal:3128', 'https_proxy': amulet_http_proxy,
} }
neutron_api_config['openstack-origin-git'] = yaml.dump(openstack_origin_git) neutron_api_config['openstack-origin-git'] = yaml.dump(openstack_origin_git)
keystone_config = {'admin-password': 'openstack', keystone_config = {'admin-password': 'openstack',