diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-10-05 13:49:08 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-10-05 13:49:08 -0400 |
| commit | 9fd4af295a7c88b4c112b9bd500e396a766b3dc0 (patch) | |
| tree | c86ab69cda7d6a1402c779968bb20b41c8fd4012 /bin/cluster | |
| parent | 7918909dc7c6877a4ce2b9fab830d0c41c1c92fd (diff) | |
| parent | 3073d1f729f9dcd202088f6b318b465567c6344b (diff) | |
| download | openshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.tar.gz openshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.tar.bz2 openshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.tar.xz openshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.zip | |
Merge pull request #654 from openshift/revert-641-gce-support
Revert "GCE support" because it breaks openstack.
Diffstat (limited to 'bin/cluster')
| -rwxr-xr-x | bin/cluster | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/bin/cluster b/bin/cluster index 0e305141f..582327415 100755 --- a/bin/cluster +++ b/bin/cluster @@ -142,14 +142,10 @@ class Cluster(object): """ config = ConfigParser.ConfigParser() if 'gce' == provider: - 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) + config.readfp(open('inventory/gce/hosts/gce.ini')) + + for key in config.options('gce'): + os.environ[key] = config.get('gce', key) inventory = '-i inventory/gce/hosts' elif 'aws' == provider: |