summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2015-06-10 10:31:39 -0400
committerScott Dodson <sdodson@redhat.com>2015-06-16 15:52:44 -0400
commit7b316631a2b988318b47d3a50a7b66e3ff3fdbd2 (patch)
tree065562cf45a0fb03a6cd66844ee655188325685d /roles/openshift_facts/library
parente903a6b5be49728e31756e5114f7c6ed2553747a (diff)
downloadopenshift-7b316631a2b988318b47d3a50a7b66e3ff3fdbd2.tar.gz
openshift-7b316631a2b988318b47d3a50a7b66e3ff3fdbd2.tar.bz2
openshift-7b316631a2b988318b47d3a50a7b66e3ff3fdbd2.tar.xz
openshift-7b316631a2b988318b47d3a50a7b66e3ff3fdbd2.zip
Update for RC2 changes
Remove openshift-deployer.kubeconfig from master template Sync config template Update enterprise image names Switch to node auto registration Add deployer to list of serviceAccountConfig.managedNames Move package installation before registering facts change default kubeconfig location Change system:openshift-client to system:openshift-master Rename node cert/key/kubeconfig per openshift/origin#3160 Update references to /var/lib/openshift/openshift.local.certificates
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 7bc7c3260..1b789ca89 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -298,10 +298,10 @@ def set_registry_url_if_unset(facts):
if 'registry_url' not in facts[role]:
registry_url = "openshift/origin-${component}:${version}"
if deployment_type == 'enterprise':
- registry_url = "openshift3_beta/ose-${component}:${version}"
+ registry_url = "openshift3/ose-${component}:${version}"
elif deployment_type == 'online':
registry_url = ("docker-registry.ops.rhcloud.com/"
- "openshift3_beta/ose-${component}:${version}")
+ "openshift3/ose-${component}:${version}")
facts[role]['registry_url'] = registry_url
return facts
@@ -450,7 +450,9 @@ def get_current_config(facts):
# TODO: parse the /etc/sysconfig/openshift-{master,node} config to
# determine the location of files.
-
+ # TODO: I suspect this isn't working right now, but it doesn't prevent
+ # anything from working properly as far as I can tell, perhaps because
+ # we override the kubeconfig path everywhere we use it?
# Query kubeconfig settings
kubeconfig_dir = '/var/lib/openshift/openshift.local.certificates'
if role == 'node':