diff --git a/docs/about/installation.mdx b/docs/about/installation.mdx index d5baa8aa6..daf8b2a87 100644 --- a/docs/about/installation.mdx +++ b/docs/about/installation.mdx @@ -29,10 +29,10 @@ runtime. curl -LsSf https://raw.githubusercontent.com/NVIDIA/OpenShell/main/install.sh | sh -s -- --compute-driver podman ``` -Supported values are `docker`, `podman`, `vm`, and `auto`. Podman selection -also makes the gateway listener reachable from rootless containers. Docker and -VM selection keep the listener on loopback. `auto` removes an existing driver -pin so the gateway can detect a runtime. Set +Supported values are `docker`, `podman`, and `vm`. Podman selection also makes +the gateway listener reachable from rootless containers. Docker and VM +selection keep the listener on loopback. Omit the option to retain automatic +driver selection. Set `OPENSHELL_INSTALL_COMPUTE_DRIVER` instead when an environment variable is more convenient; the command-line option takes precedence. diff --git a/install.sh b/install.sh index bbd80c77a..9dc396a95 100755 --- a/install.sh +++ b/install.sh @@ -48,8 +48,8 @@ USAGE: OPTIONS: --compute-driver DRIVER - Persist the gateway compute driver: auto, docker, podman, - or vm. Install the required runtime or driver separately. + Persist the gateway compute driver: docker, podman, or vm. + Install the required runtime or driver separately. --help Print this help message. ENVIRONMENT VARIABLES: @@ -97,13 +97,13 @@ parse_install_args() { done case "$INSTALL_COMPUTE_DRIVER" in - "" | auto | docker | podman | vm) + "" | docker | podman | vm) ;; kubernetes) error "--compute-driver kubernetes is not supported by the local installer; use the OpenShell Helm chart" ;; *) - error "unsupported compute driver '${INSTALL_COMPUTE_DRIVER}'; expected auto, docker, podman, or vm" + error "unsupported compute driver '${INSTALL_COMPUTE_DRIVER}'; expected docker, podman, or vm" ;; esac } @@ -749,8 +749,6 @@ configure_gateway_compute_driver() { docker | vm) set -- "$@" --bind-address "127.0.0.1:${LOCAL_GATEWAY_PORT}" ;; - auto) - ;; esac info "configuring gateway compute driver: ${INSTALL_COMPUTE_DRIVER}" diff --git a/tasks/scripts/test-install-sh.sh b/tasks/scripts/test-install-sh.sh index 12fc79537..691c2b4bb 100755 --- a/tasks/scripts/test-install-sh.sh +++ b/tasks/scripts/test-install-sh.sh @@ -284,10 +284,10 @@ assert_driver_configuration \ vm \ "/test/bin/openshell-gateway config set --compute-driver vm --bind-address 127.0.0.1:17670" -assert_driver_configuration \ - "auto selection removes only the driver pin" \ - auto \ - "/test/bin/openshell-gateway config set --compute-driver auto" +assert_driver_parse_fails \ + "compute-driver leaves automatic selection to the default installation" \ + "unsupported compute driver 'auto'" \ + --compute-driver auto assert_driver_prerequisite_notice \ "docker selection prints prerequisite guidance" \