summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-07 13:28:53 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-07 13:28:53 -0500
commit51eeaf70c19e4f79d136c8d7470fe91cc780b813 (patch)
tree40343e729f6e73b377ed601eb5e7b94592ad5a2e
parente807b15822a68aed9ed8d1c07a3b623bd4ad8cc3 (diff)
parent635df52db7ed51593135f53feae1cf7d48ad2a71 (diff)
downloadopenshift-51eeaf70c19e4f79d136c8d7470fe91cc780b813.tar.gz
openshift-51eeaf70c19e4f79d136c8d7470fe91cc780b813.tar.bz2
openshift-51eeaf70c19e4f79d136c8d7470fe91cc780b813.tar.xz
openshift-51eeaf70c19e4f79d136c8d7470fe91cc780b813.zip
Merge pull request #1134 from sdodson/cli-wrapper
Add a banner to CLI wrapper instructing users that it's only for boot…
-rw-r--r--roles/openshift_cli/templates/openshift.j216
1 files changed, 15 insertions, 1 deletions
diff --git a/roles/openshift_cli/templates/openshift.j2 b/roles/openshift_cli/templates/openshift.j2
index d773e9b1c..a7c148a22 100644
--- a/roles/openshift_cli/templates/openshift.j2
+++ b/roles/openshift_cli/templates/openshift.j2
@@ -6,4 +6,18 @@ cmd=`basename $0`
user=`id -u`
group=`id -g`
-docker run -i -a STDERR -a STDOUT -a STDIN --privileged --net=host --user=${user}:${group} -v ~/.kube:/root/.kube -v /tmp:/tmp -v {{ openshift.common.config_base}}:{{ openshift.common.config_base }} -e KUBECONFIG=/root/.kube/config --entrypoint ${cmd} --rm {{ openshift.common.cli_image }} "${@}"
+>&2 echo """
+================================================================================
+ATTENTION: You are running ${cmd} via a wrapper around 'docker run {{ openshift.common.cli_image }}'.
+This wrapper is intended only to be used to bootstrap an environment. Please
+install client tools on another host once you have granted cluster-admin
+privileges to a user.
+{% if openshift.common.deployment_type in ['openshift-enterprise','atomic-enterprise'] %}
+See https://docs.openshift.com/enterprise/latest/cli_reference/get_started_cli.html
+{% else %}
+See https://docs.openshift.org/latest/cli_reference/get_started_cli.html
+{% endif %}
+=================================================================================
+"""
+
+docker run -i --privileged --net=host --user=${user}:${group} -v ~/.kube:/root/.kube -v /tmp:/tmp -v {{ openshift.common.config_base}}:{{ openshift.common.config_base }} -e KUBECONFIG=/root/.kube/config --entrypoint ${cmd} --rm {{ openshift.common.cli_image }} "${@}"