summaryrefslogtreecommitdiffstats
path: root/images/installer/root
diff options
context:
space:
mode:
Diffstat (limited to 'images/installer/root')
-rw-r--r--images/installer/root/etc/inventory-generator-config.yaml3
-rwxr-xr-ximages/installer/root/usr/local/bin/generate6
2 files changed, 2 insertions, 7 deletions
diff --git a/images/installer/root/etc/inventory-generator-config.yaml b/images/installer/root/etc/inventory-generator-config.yaml
index 8a9974f95..d56e3f4d2 100644
--- a/images/installer/root/etc/inventory-generator-config.yaml
+++ b/images/installer/root/etc/inventory-generator-config.yaml
@@ -18,6 +18,3 @@ openshift_image_tag: v3.6.0
openshift_hosted_logging_deploy: null # defaults to "true" if loggingPublicURL is set in master-config.yaml
openshift_logging_image_version: v3.6.0
openshift_disable_check: ""
-
-# openshift cluster-viewer info
-openshift_cluster_user: cluster-lister # name of user or service account able to list nodes in a cluster
diff --git a/images/installer/root/usr/local/bin/generate b/images/installer/root/usr/local/bin/generate
index 4a6f7ce19..3db7a3ee8 100755
--- a/images/installer/root/usr/local/bin/generate
+++ b/images/installer/root/usr/local/bin/generate
@@ -263,8 +263,6 @@ def main():
openshift_logging_image_version = user_config.get('openshift_logging_image_version')
openshift_disable_check = user_config.get('openshift_disable_check')
- openshift_cluster_user = user_config.get('openshift_cluster_user', 'developer')
-
# extract host config info from parsed yaml file
asset_config = y.get("assetConfig")
master_config = y.get("kubernetesMasterConfig")
@@ -290,9 +288,9 @@ def main():
oc.whoami()
except OpenShiftClientError as err:
msg = ("Unable to obtain user information using the provided kubeconfig file. "
- "User '{}' does not appear to be logged in, or to have correct authorization. "
+ "Current context does not appear to be able to authenticate to the server. "
"Error returned from server:\n\n{}")
- print msg.format(openshift_cluster_user, str(err))
+ print msg.format(str(err))
exit(1)
# connect to remote host using the provided config and extract all possible node information