Skip to content

Commit

Permalink
Allow for configuration of profiling with $OPENSHIFT_PROFILE
Browse files Browse the repository at this point in the history
In order for the generic start utilities to support the command tests,
it is necessary for a user to be able to specify which profiling mode
they would like.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
  • Loading branch information
stevekuznetsov committed May 5, 2017
1 parent 60e6273 commit 9bd4bb3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions hack/lib/start.sh
Expand Up @@ -284,7 +284,7 @@ function os::start::master() {
os::log::debug "$( ps -ef | grep openshift )"

os::log::debug "Starting OpenShift server"
local openshift_env=( "OPENSHIFT_PROFILE=web" "OPENSHIFT_ON_PANIC=crash" )
local openshift_env=( "OPENSHIFT_PROFILE=${OPENSHIFT_PROFILE:-web}" "OPENSHIFT_ON_PANIC=crash" )
$(os::start::internal::openshift_executable) start master \
--loglevel=4 \
--logspec='*importer=5' \
Expand Down Expand Up @@ -334,7 +334,7 @@ function os::start::all_in_one() {
fi

os::log::debug "Starting OpenShift server"
local openshift_env=( "OPENSHIFT_PROFILE=web" "OPENSHIFT_ON_PANIC=crash" )
local openshift_env=( "OPENSHIFT_PROFILE=${OPENSHIFT_PROFILE:-web}" "OPENSHIFT_ON_PANIC=crash" )
local openshift_executable
openshift_executable="$(os::start::internal::openshift_executable)"
${openshift_executable} start \
Expand Down Expand Up @@ -410,7 +410,7 @@ readonly -f os::start::etcd
function os::start::api_server() {
local api_server_version=${1:-}
local openshift_volumes=( "${MASTER_CONFIG_DIR}" )
local openshift_env=( "OPENSHIFT_PROFILE=web" "OPENSHIFT_ON_PANIC=crash" )
local openshift_env=( "OPENSHIFT_PROFILE=${OPENSHIFT_PROFILE:-web}" "OPENSHIFT_ON_PANIC=crash" )
local openshift_executable
openshift_executable="$(os::start::internal::openshift_executable "${api_server_version}")"

Expand Down

0 comments on commit 9bd4bb3

Please sign in to comment.