Browse Source

Merge "Get password for shipyard user for special variable if it exists"

changes/02/666402/3
Zuul 2 years ago
committed by Gerrit Code Review
parent
commit
d1d945951c
3 changed files with 6 additions and 3 deletions
  1. +2
    -1
      tools/run_shipyard.sh
  2. +2
    -1
      tools/set_env
  3. +2
    -1
      tools/shipyard.sh

+ 2
- 1
tools/run_shipyard.sh View File

@ -37,7 +37,8 @@ SHIPYARD_HOSTPATH=${SHIPYARD_HOSTPATH:-"/home/shipyard/host"}
# set default value for OS_PASSWORD if it's not set
# this doesn't actually get exported to environment
# unless the script is sourced
export OS_PASSWORD=${OS_PASSWORD:-password}
OS_SHIPYARD_PASSWORD=${OS_SHIPYARD_PASSWORD:-${OS_PASSWORD}}
export OS_PASSWORD=${OS_SHIPYARD_PASSWORD:-password}
# Execute Shipyard CLI
#


+ 2
- 1
tools/set_env View File

@ -33,7 +33,8 @@ namespace="${namespace:-ucp}"
export max_shipyard_count=${max_shipyard_count:-60}
export shipyard_query_time=${shipyard_query_time:-90}
export OS_AUTH_URL="${OS_AUTH_URL:-http://keystone.${namespace}.svc.cluster.local:80/v3}"
export OS_PASSWORD="${OS_PASSWORD:-password}"
OS_SHIPYARD_PASSWORD=${OS_SHIPYARD_PASSWORD:-${OS_PASSWORD}}
export OS_PASSWORD=${OS_SHIPYARD_PASSWORD:-password}
export OS_PROJECT_DOMAIN_NAME="${OS_PROJECT_DOMAIN_NAME:-default}"
export OS_PROJECT_NAME="${OS_PROJECT_NAME:-service}"
export OS_USERNAME="${OS_USERNAME:-shipyard}"


+ 2
- 1
tools/shipyard.sh View File

@ -42,7 +42,8 @@ SHIPYARD_IMAGE="${SHIPYARD_IMAGE:-quay.io/airshipit/shipyard:master}"
# set default value for OS_PASSWORD if it's not set
# this doesn't actually get exported to environment
# unless the script is sourced
export OS_PASSWORD=${OS_PASSWORD:-password}
OS_SHIPYARD_PASSWORD=${OS_SHIPYARD_PASSWORD:-${OS_PASSWORD}}
export OS_PASSWORD=${OS_SHIPYARD_PASSWORD:-password}
# Define Base Docker Command
base_docker_command=$(cat << EndOfCommand


Loading…
Cancel
Save