summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-08-23 19:51:19 -0400
committerGitHub <noreply@github.com>2017-08-23 19:51:19 -0400
commita535b7e99fbaff4bc8ee10bbedf8c47d4aabe94c (patch)
treef8aa880f5ded0005ed520da4163c358884db812d /roles
parentb8e45471aa70881ff608962f0fec236c31c2398d (diff)
parent825c187c07d592838aac20c41848b336835ef3b5 (diff)
downloadopenshift-a535b7e99fbaff4bc8ee10bbedf8c47d4aabe94c.tar.gz
openshift-a535b7e99fbaff4bc8ee10bbedf8c47d4aabe94c.tar.bz2
openshift-a535b7e99fbaff4bc8ee10bbedf8c47d4aabe94c.tar.xz
openshift-a535b7e99fbaff4bc8ee10bbedf8c47d4aabe94c.zip
Merge pull request #5100 from mgugino-upstream-stage/check-hostname-len
Add hostname/nodename length check
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_common/tasks/main.yml4
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py4
2 files changed, 5 insertions, 3 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index 51313a258..a0bd6c860 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/roles/openshift_common/tasks/main.yml
@@ -40,8 +40,8 @@
when: openshift_use_calico | default(false) | bool and openshift_use_contiv | default(false) | bool
- fail:
- msg: openshift_hostname must be 64 characters or less
- when: openshift_hostname is defined and openshift_hostname | length > 64
+ msg: openshift_hostname must be 63 characters or less
+ when: openshift_hostname is defined and openshift_hostname | length > 63
- name: Set common Cluster facts
openshift_facts:
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 844d77255..251d1dfb4 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -193,7 +193,9 @@ def hostname_valid(hostname):
"""
if (not hostname or
hostname.startswith('localhost') or
- hostname.endswith('localdomain')):
+ hostname.endswith('localdomain') or
+ # OpenShift will not allow a node with more than 63 chars in name.
+ len(hostname) > 63):
return False
return True