starlingx/clients
Code Issues Proposed changes

Support for full image paths

Browse Source 
Remote clients always pulled their images from docker.io, with
the only thing changing being the tag of the image. Now, the
full image path is configurable.

Change-Id: Ie62a38a28e456681f4fa40762783f7fc4adbbe4f
Story: 2006711
Task: 39093
Signed-off-by: Stefan Dinescu <stefan.dinescu@windriver.com>
This commit is contained in:
Stefan Dinescu 2020-03-18 16:17:07 +02:00
parent 0ca280c7a2
commit be41771eda
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
remote_cli/README
View File

@ -42,6 +42,15 @@ To install the clients on a Linux machine follow these steps:
1. Untar the provided SDK module tarball 1. Untar the provided SDK module tarball
If you want to use your own docker images for remote-clients or
pushed the default images to your own private docker registry,
you can edit the PLATFORM_DOCKER_IMAGE and APPLICATION_DOCKER_IMAGE
variables in the docker_image_versions.sh file.
NOTE: If you are pulling images from custom docker registries that require
authentication, use the "docker login" command to login to that custom
registry, before attempting to run commands for the first time.
2. Download the openrc file from Horizon. 2. Download the openrc file from Horizon.
Log in to Horizon as the user and tenant that you want to use the Log in to Horizon as the user and tenant that you want to use the
remote CLIs as, go to: remote CLIs as, go to:

4
remote_cli/client_wrapper.sh
View File

@ -11,7 +11,7 @@ KUBE_CFG_PATH="/root/.kube/config"
SHELL_TYPE=$(uname -s) SHELL_TYPE=$(uname -s)
if [[ "$CONFIG_TYPE" = "platform" ]]; then if [[ "$CONFIG_TYPE" = "platform" ]]; then
CLIENT_IMAGE_NAME="docker.io/starlingx/stx-platformclients:${PLATFORM_DOCKER_IMAGE_TAG}" CLIENT_IMAGE_NAME="${PLATFORM_DOCKER_IMAGE}"
# We only need to configure the kubernetes authentication file on the platform container # We only need to configure the kubernetes authentication file on the platform container
if [[ "${SHELL_TYPE}" == *"CYGWIN"* ]]; then if [[ "${SHELL_TYPE}" == *"CYGWIN"* ]]; then
# On Windows 10, native docker needs the full windows path, not the UNIX one, # On Windows 10, native docker needs the full windows path, not the UNIX one,
@ -21,7 +21,7 @@ if [[ "$CONFIG_TYPE" = "platform" ]]; then
VOLUME_LIST="--volume ${OSC_WORKDIR}:/wd --volume ${K8S_CONFIG_FILE}:${KUBE_CFG_PATH}" VOLUME_LIST="--volume ${OSC_WORKDIR}:/wd --volume ${K8S_CONFIG_FILE}:${KUBE_CFG_PATH}"
fi fi
else else
CLIENT_IMAGE_NAME="docker.io/starlingx/stx-openstackclients:${APPLICATION_DOCKER_IMAGE_TAG}" CLIENT_IMAGE_NAME="${APPLICATION_DOCKER_IMAGE}"
if [[ "${SHELL_TYPE}" == *"CYGWIN"* ]]; then if [[ "${SHELL_TYPE}" == *"CYGWIN"* ]]; then
VOLUME_LIST="--volume $(cygpath -m ${OSC_WORKDIR}):/wd" VOLUME_LIST="--volume $(cygpath -m ${OSC_WORKDIR}):/wd"
else else

4
remote_cli/docker_image_version.sh
View File

@ -1,2 +1,2 @@
export PLATFORM_DOCKER_IMAGE_TAG="master-centos-stable-latest" export PLATFORM_DOCKER_IMAGE="docker.io/starlingx/stx-platformclients:stx.4.0-v1.0.0"
export APPLICATION_DOCKER_IMAGE_TAG="master-centos-stable-latest" export APPLICATION_DOCKER_IMAGE="docker.io/starlingx/stx-openstackclients:master-centos-stable-latest"