diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-19 14:13:55 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-19 14:13:55 -0500 |
| commit | a1867d5eb999420884513e322d1fa333fce33633 (patch) | |
| tree | f0b45483bfcb248b54bad28018ad9a82789ac4b7 /roles/openshift_facts | |
| parent | c10c59d4919d6a61df96cdcaf3b407623125a46d (diff) | |
| parent | 7d7de31659bb15e9690df082d4129c73c4c413cf (diff) | |
| download | openshift-a1867d5eb999420884513e322d1fa333fce33633.tar.gz openshift-a1867d5eb999420884513e322d1fa333fce33633.tar.bz2 openshift-a1867d5eb999420884513e322d1fa333fce33633.tar.xz openshift-a1867d5eb999420884513e322d1fa333fce33633.zip | |
Merge pull request #1144 from detiber/gce_sdn
Remove default disable of SDN for GCE
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 2a3d4acbd..831d78b83 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -188,9 +188,6 @@ def normalize_gce_facts(metadata, facts): _, _, zone = metadata['instance']['zone'].rpartition('/') facts['zone'] = zone - # Default to no sdn for GCE deployments - facts['use_openshift_sdn'] = False - # GCE currently only supports a single interface facts['network']['ip'] = facts['network']['interfaces'][0]['ips'][0] pub_ip = facts['network']['interfaces'][0]['public_ips'][0] @@ -884,10 +881,6 @@ def apply_provider_facts(facts, provider_facts): if not provider_facts: return facts - use_openshift_sdn = provider_facts.get('use_openshift_sdn') - if isinstance(use_openshift_sdn, bool): - facts['common']['use_openshift_sdn'] = use_openshift_sdn - common_vars = [('hostname', 'ip'), ('public_hostname', 'public_ip')] for h_var, ip_var in common_vars: ip_value = provider_facts['network'].get(ip_var) @@ -1078,7 +1071,7 @@ class OpenShiftFacts(object): Raises: OpenShiftFactsUnsupportedRoleError: """ - known_roles = ['common', 'master', 'node', 'master_sdn', 'node_sdn', 'etcd', 'nfs'] + known_roles = ['common', 'master', 'node', 'etcd', 'nfs'] def __init__(self, role, filename, local_facts, additive_facts_to_overwrite=False): self.changed = False |