airship/shipyard
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2019-06-21 20:53:54 +00:00 committed by Gerrit Code Review
commit d1d945951c
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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 # set default value for OS_PASSWORD if it's not set
# this doesn't actually get exported to environment # this doesn't actually get exported to environment
# unless the script is sourced # 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 # Execute Shipyard CLI
# #

3
tools/set_env
View File

@ -33,7 +33,8 @@ namespace="${namespace:-ucp}"
export max_shipyard_count=${max_shipyard_count:-60} export max_shipyard_count=${max_shipyard_count:-60}
export shipyard_query_time=${shipyard_query_time:-90} 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_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_DOMAIN_NAME="${OS_PROJECT_DOMAIN_NAME:-default}"
export OS_PROJECT_NAME="${OS_PROJECT_NAME:-service}" export OS_PROJECT_NAME="${OS_PROJECT_NAME:-service}"
export OS_USERNAME="${OS_USERNAME:-shipyard}" export OS_USERNAME="${OS_USERNAME:-shipyard}"

3
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 # set default value for OS_PASSWORD if it's not set
# this doesn't actually get exported to environment # this doesn't actually get exported to environment
# unless the script is sourced # 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 # Define Base Docker Command
base_docker_command=$(cat << EndOfCommand base_docker_command=$(cat << EndOfCommand