diff options
| author | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-08-18 10:46:23 +0200 |
|---|---|---|
| committer | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-10-01 13:49:10 +0200 |
| commit | a22fbd327ab9decda9543d47c1ba375b9faecffd (patch) | |
| tree | 8c1c0cb011980a015fd798612777eece523b5753 /bin | |
| parent | 6f5fff8a542d544916427ce625fe46ec31fa76d3 (diff) | |
| download | openshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.tar.gz openshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.tar.bz2 openshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.tar.xz openshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.zip | |
GCE-support (more information in PR, README_GCE.md)
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/cluster | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/bin/cluster b/bin/cluster index 582327415..e72ce547c 100755 --- a/bin/cluster +++ b/bin/cluster @@ -142,10 +142,14 @@ class Cluster(object): """ config = ConfigParser.ConfigParser() if 'gce' == provider: - config.readfp(open('inventory/gce/hosts/gce.ini')) + gce_ini_default_path = os.path.join( + 'inventory/gce/hosts/gce.ini') + gce_ini_path = os.environ.get('GCE_INI_PATH', gce_ini_default_path) + if os.path.exists(gce_ini_path): + config.readfp(open(gce_ini_path)) - for key in config.options('gce'): - os.environ[key] = config.get('gce', key) + for key in config.options('gce'): + os.environ[key] = config.get('gce', key) inventory = '-i inventory/gce/hosts' elif 'aws' == provider: @@ -193,7 +197,7 @@ class Cluster(object): if args.option: for opt in args.option: k, v = opt.split('=', 1) - env['cli_' + k] = v + env[k] = v ansible_env = '-e \'{}\''.format( ' '.join(['%s=%s' % (key, value) for (key, value) in env.items()]) |