diff options
| author | Luke Meyer <lmeyer@redhat.com> | 2017-09-13 14:41:00 -0400 |
|---|---|---|
| committer | Luke Meyer <lmeyer@redhat.com> | 2017-09-13 14:46:38 -0400 |
| commit | a638d23e3aa2a1d78c1568a1f6342faf7ecac091 (patch) | |
| tree | 2d8a330d6f05e101427f76a1631818dd778952c0 /images/installer/root | |
| parent | 0ee022ab5a403752d8f8309b63639980871a4edc (diff) | |
| download | openshift-a638d23e3aa2a1d78c1568a1f6342faf7ecac091.tar.gz openshift-a638d23e3aa2a1d78c1568a1f6342faf7ecac091.tar.bz2 openshift-a638d23e3aa2a1d78c1568a1f6342faf7ecac091.tar.xz openshift-a638d23e3aa2a1d78c1568a1f6342faf7ecac091.zip | |
inventory generate: remove refs to openshift_cluster_user
Diffstat (limited to 'images/installer/root')
| -rw-r--r-- | images/installer/root/etc/inventory-generator-config.yaml | 3 | ||||
| -rwxr-xr-x | images/installer/root/usr/local/bin/generate | 6 |
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 |