← Back to branch summary

~corey.bryant/charms/trusty/quantum-gateway/git

« back to all changes in this revision

Viewing changes to tests/basic_deployment.py

  • Committer: Corey Bryant
  • Date: 2015-04-13 12:13:17 UTC
  • Revision ID: corey.bryant@canonical.com-20150413121317-0e7t0ff617tf5jb8
Get http_proxy from AMULET_HTTP_PROXY env var

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/basic_deployment.py
1
1
#!/usr/bin/python
2
2
 
3
3
import amulet
 
4
import os
4
5
import time
5
6
import yaml
6
7
try:
70
71
        quantum_gateway_config = {}
71
72
        if self.git:
72
73
            branch = 'stable/' + self._get_openstack_release_string()
 
74
            amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
73
75
            openstack_origin_git = {
74
76
                'repositories': [
75
77
                    {'name': 'requirements',
80
82
                     'branch': branch},
81
83
                ],
82
84
                'directory': '/mnt/openstack-git',
83
 
                'http_proxy': 'http://squid.internal:3128',
84
 
                'https_proxy': 'https://squid.internal:3128',
 
85
                'http_proxy': amulet_http_proxy,
 
86
                'https_proxy': amulet_http_proxy,
85
87
            }
86
88
            quantum_gateway_config['openstack-origin-git'] = yaml.dump(openstack_origin_git)
87
89
        keystone_config = {'admin-password': 'openstack',