inventory generate: remove refs to openshift_cluster_user

3 files changed, 4 insertions, 13 deletions

diff --git a/images/installer/README_INVENTORY_GENERATOR.md b/images/installer/README_INVENTORY_GENERATOR.md
index cf621b356..72a0acc70 100644
--- a/images/installer/README_INVENTORY_GENERATOR.md
+++ b/images/installer/README_INVENTORY_GENERATOR.md
@@ -10,10 +10,6 @@ User configuration helps to provide additional details when creating an inventor
 The default location of this file is in `root/etc/inventory-generator-config.yaml`. The
 following configuration values are either expected or default to the given values when omitted:
 
-- `openshift_cluster_user`:
-  - username of account capable of listing nodes in a cluster
-  - used for querying the cluster using `oc` to retrieve additional node information.
-
 - `master_config_path`:
   - specifies where to look for the bind-mounted `master-config.yaml` file in the container
   - if omitted or a `null` value is given, its value is defaulted to `/opt/app-root/src/master-config.yaml`
@@ -40,7 +36,7 @@ See `README_CONTAINER_IMAGE.md` for information on building this image.
 
 Given a master node's `master-config.yaml` file, a user configuration file (see "Configure" section), and an `admin.kubeconfig` file, the command below will:
 
-1. Use `oc` to query the host about additional node information (using the supplied `kubeconfig` file and `openshift_cluster_user` value)
+1. Use `oc` to query the host about additional node information (using the supplied `kubeconfig` file)
 2. Generate an inventory file based on information retrieved from `oc get nodes` and the given `master-config.yaml` file.
 3. run the specified [openshift-ansible](https://github.com/openshift/openshift-ansible) `health.yml` playbook using the generated inventory file from the previous step
 
@@ -86,4 +82,4 @@ bash-4.2$ less generated_hosts
 
 ## Notes
 
-See `README_CONTAINER_IMAGE.md` for additional information about this image.
\ No newline at end of file
+See `README_CONTAINER_IMAGE.md` for additional information about this image.
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