summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-07 16:34:05 -0500
committerScott Dodson <sdodson@redhat.com>2016-11-07 16:49:10 -0500
commit90345971adfb4385c8336e5e3a6ae6487a809bac (patch)
tree32ff47e9073fb88c4369b2cd56d2a58ad913e385 /roles/openshift_facts/library
parent9b1dd97dbf5f205edf4a0e1b24d24a3f9d8a78e6 (diff)
downloadopenshift-90345971adfb4385c8336e5e3a6ae6487a809bac.tar.gz
openshift-90345971adfb4385c8336e5e3a6ae6487a809bac.tar.bz2
openshift-90345971adfb4385c8336e5e3a6ae6487a809bac.tar.xz
openshift-90345971adfb4385c8336e5e3a6ae6487a809bac.zip
Revert "Fix OpenStack cloud provider"
This reverts commit 1f2276fff1e41c1d9440ee8b589042ee249b95d7.
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 36a2d1f4f..4e68d9710 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -148,7 +148,6 @@ def hostname_valid(hostname):
if (not hostname or
hostname.startswith('localhost') or
hostname.endswith('localdomain') or
- hostname.endswith('novalocal') or
len(hostname.split('.')) < 2):
return False
@@ -918,14 +917,6 @@ def set_sdn_facts_if_unset(facts, system_facts):
return facts
-def set_nodename(facts):
- if 'node' in facts and 'common' in facts:
- if 'cloudprovider' in facts and facts['cloudprovider']['kind'] == 'openstack':
- facts['node']['nodename'] = facts['provider']['metadata']['hostname'].replace('.novalocal', '')
- else:
- facts['node']['nodename'] = facts['common']['hostname'].lower()
- return facts
-
def migrate_oauth_template_facts(facts):
"""
Migrate an old oauth template fact to a newer format if it's present.
@@ -1785,7 +1776,6 @@ class OpenShiftFacts(object):
facts = set_proxy_facts(facts)
if not safe_get_bool(facts['common']['is_containerized']):
facts = set_installed_variant_rpm_facts(facts)
- facts = set_nodename(facts)
return dict(openshift=facts)
def get_defaults(self, roles, deployment_type, deployment_subtype):