summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-02-08 23:21:36 -0500
committerJason DeTiberus <jdetiber@redhat.com>2016-02-11 12:49:50 -0500
commit047c771ad882242774ceb971c02e82d1ca2cea15 (patch)
treee98460966ca167e7f52e277a6eac46b7ebdb34d0
parentcfb19e24b7b93fd3b73201358d3f3ceb67840a05 (diff)
downloadopenshift-047c771ad882242774ceb971c02e82d1ca2cea15.tar.gz
openshift-047c771ad882242774ceb971c02e82d1ca2cea15.tar.bz2
openshift-047c771ad882242774ceb971c02e82d1ca2cea15.tar.xz
openshift-047c771ad882242774ceb971c02e82d1ca2cea15.zip
Fix loopback cluster name, context name, and user
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 5f5c5c788..8707417d1 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -525,10 +525,11 @@ def set_url_facts_if_unset(facts):
ports[prefix]))
- r_lhn = "{0}:{1}".format(api_hostname, ports['api']).replace('.', '-')
+ r_lhn = "{0}:{1}".format(hostname, ports['api']).replace('.', '-')
+ r_lhu = "system:openshift-master/{0}:{1}".format(api_hostname, ports['api']).replace('.', '-')
facts['master'].setdefault('loopback_cluster_name', r_lhn)
facts['master'].setdefault('loopback_context_name', "default/{0}/system:openshift-master".format(r_lhn))
- facts['master'].setdefault('loopback_user', "system:openshift-master/{0}".format(r_lhn))
+ facts['master'].setdefault('loopback_user', r_lhu)
prefix_hosts = [('console', api_hostname), ('public_console', api_public_hostname)]
for prefix, host in prefix_hosts: