Merge pull request #8853 from stevekuznetsov/skuznets/bash-preamble-ii

Merged by openshift-bot

Author: OpenShift Bot

Diff for: contrib/vagrant/provision-config.sh

@@ -7,14 +7,14 @@ set -o pipefail
 # Set a useful format for xtrace output
 # export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
 
-ORIGIN_ROOT=$(
+OS_ROOT=$(
   unset CDPATH
   origin_root=$(dirname "${BASH_SOURCE}")/../..
   cd "${origin_root}"
   pwd
 )
-source ${ORIGIN_ROOT}/hack/common.sh
-source ${ORIGIN_ROOT}/contrib/vagrant/provision-util.sh
+source "${OS_ROOT}/hack/lib/init.sh"
+source ${OS_ROOT}/contrib/vagrant/provision-util.sh
 
 # Passed as arguments to provisioning script
 MASTER_IP=${1:-""}
@@ -26,7 +26,7 @@ INSTANCE_PREFIX=${4:-${OPENSHIFT_INSTANCE_PREFIX:-openshift}}
 FIXUP_NET_UDEV=false
 NETWORK_PLUGIN=${OPENSHIFT_NETWORK_PLUGIN:-""}
 NODE_INDEX=0
-CONFIG_ROOT=${ORIGIN_ROOT}
+CONFIG_ROOT=${OS_ROOT}
 SKIP_BUILD=${OPENSHIFT_SKIP_BUILD:-false}
 
 # Parse optional arguments

Diff for: contrib/vagrant/provision-dind.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euo
 
-ORIGIN_ROOT=$(
+OS_ROOT=$(
   unset CDPATH
   origin_root=$(dirname "${BASH_SOURCE}")/../..
   cd "${origin_root}"
@@ -28,21 +28,21 @@ systemctl start docker
 setenforce 0 || true
 
 # Add a convenience symlink to the gopath repo
-ln -sf "${ORIGIN_ROOT}" /
+ln -sf "${OS_ROOT}" /
 
 function set_env {
   USER_DIR="${1}"
   # Prefer bashrc to bash_profile since bash_profile is only loaded on
   # login and bashrc is loaded by bash_profile anyway.
   TARGET="${USER_DIR}/.bashrc"
-  OUTPUT_PATH="${ORIGIN_ROOT}/_output/local"
+  OUTPUT_PATH="${OS_ROOT}/_output/local"
   if [[ -z "$(grep ${OUTPUT_PATH} ${TARGET})" ]]; then
     echo "export GOPATH=${OUTPUT_PATH}/go" >> ${TARGET}
     # Binpath for origin binaries
     echo "export PATH=${OUTPUT_PATH}/bin/linux/amd64:\$PATH" >> ${TARGET}
     # Binpath for go-getted binaries
     echo "export PATH=${OUTPUT_PATH}/go/bin:\$PATH" >> ${TARGET}
-    echo "cd ${ORIGIN_ROOT}" >> ${TARGET}
+    echo "cd ${OS_ROOT}" >> ${TARGET}
   else
     echo "path variables for ${USER_DIR} already configured"
   fi

Diff for: contrib/vagrant/provision-master.sh

@@ -2,12 +2,12 @@
 
 source $(dirname $0)/provision-config.sh
 
-os::provision::base-provision "${ORIGIN_ROOT}" true
+os::provision::base-provision "${OS_ROOT}" true
 
-os::provision::build-origin "${ORIGIN_ROOT}" "${SKIP_BUILD}"
-os::provision::build-etcd "${ORIGIN_ROOT}" "${SKIP_BUILD}"
+os::provision::build-origin "${OS_ROOT}" "${SKIP_BUILD}"
+os::provision::build-etcd "${OS_ROOT}" "${SKIP_BUILD}"
 
-os::provision::base-install "${ORIGIN_ROOT}" "${CONFIG_ROOT}"
+os::provision::base-install "${OS_ROOT}" "${CONFIG_ROOT}"
 
 if [[ "${SDN_NODE}" = "true" ]]; then
   # Running an sdn node on the master when using an openshift sdn
@@ -56,7 +56,7 @@ if [[ "${SDN_NODE}" = "true" ]]; then
   # as possible for the node to register itself.  Vagrant can deploy
   # in parallel but dind deploys serially for simplicity.
   if ! os::provision::in-container; then
-    os::provision::disable-node "${ORIGIN_ROOT}" "${DEPLOYED_CONFIG_ROOT}" \
+    os::provision::disable-node "${OS_ROOT}" "${DEPLOYED_CONFIG_ROOT}" \
         "${SDN_NODE_NAME}"
   fi
 fi

Diff for: contrib/vagrant/provision-node.sh

@@ -5,7 +5,7 @@ source $(dirname $0)/provision-config.sh
 # Provided index is 1-based, array is 0 based
 NODE_NAME=${NODE_NAMES[${NODE_INDEX}-1]}
 
-os::provision::base-provision "${ORIGIN_ROOT}"
+os::provision::base-provision "${OS_ROOT}"
 
 # Waiting for node config to exist before deploying allows vm
 # provisioning to safely execute in parallel.
@@ -21,7 +21,7 @@ os::provision::copy-config "${CONFIG_ROOT}"
 
 # Binaries are expected to have been built by the time node
 # configuration is available.
-os::provision::base-install "${ORIGIN_ROOT}" "${DEPLOYED_CONFIG_ROOT}"
+os::provision::base-install "${OS_ROOT}" "${DEPLOYED_CONFIG_ROOT}"
 
 echo "Launching openshift daemon"
 os::provision::start-node-service "${DEPLOYED_CONFIG_ROOT}" "${NODE_NAME}"

Diff for: contrib/vagrant/provision-util.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-source "${ORIGIN_ROOT}/contrib/node/install-sdn.sh"
+source "${OS_ROOT}/contrib/node/install-sdn.sh"
 
 os::provision::join() {
   local IFS="$1"

Diff for: examples/data-population/templates.sh

@@ -11,8 +11,8 @@ echo "Populating templates"
 
 export KUBECONFIG=${OPENSHIFT_ADMIN_CONFIG}
 
-ORIGIN_ROOT=$(dirname "${BASH_SOURCE}")/../..
-EXAMPLES_ROOT=${ORIGIN_ROOT}/examples
+OS_ROOT=$(dirname "${BASH_SOURCE}")/../..
+EXAMPLES_ROOT=${OS_ROOT}/examples
 
 TEMPLATES="$EXAMPLES_ROOT/db-templates
 $EXAMPLES_ROOT/sample-app/application-template-*

Diff for: hack/build-base-images.sh

@@ -11,8 +11,7 @@ set -o pipefail
 
 STARTTIME=$(date +%s)
 OS_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${OS_ROOT}/hack/common.sh"
-source "${OS_ROOT}/hack/util.sh"
+source "${OS_ROOT}/hack/lib/init.sh"
 os::log::install_errexit
 
 # Go to the top of the tree.

Diff for: hack/build-cross.sh

@@ -8,8 +8,7 @@ set -o pipefail
 
 STARTTIME=$(date +%s)
 OS_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${OS_ROOT}/hack/common.sh"
-source "${OS_ROOT}/hack/util.sh"
+source "${OS_ROOT}/hack/lib/init.sh"
 os::log::install_errexit
 
 platforms=( "${OS_CROSS_COMPILE_PLATFORMS[@]}" )

Diff for: hack/build-go.sh

@@ -8,8 +8,7 @@ set -o pipefail
 
 STARTTIME=$(date +%s)
 OS_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${OS_ROOT}/hack/common.sh"
-source "${OS_ROOT}/hack/util.sh"
+source "${OS_ROOT}/hack/lib/init.sh"
 os::log::install_errexit
 
 # only works on Linux for now, all other platforms must build binaries themselves

Diff for: hack/build-images.sh

@@ -13,8 +13,7 @@ set -o pipefail
 
 STARTTIME=$(date +%s)
 OS_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${OS_ROOT}/hack/common.sh"
-source "${OS_ROOT}/hack/util.sh"
+source "${OS_ROOT}/hack/lib/init.sh"
 source "${OS_ROOT}/contrib/node/install-sdn.sh"
 os::log::install_errexit
 

Diff for: hack/build-in-docker.sh

@@ -15,7 +15,7 @@ function absolute_path() {
 
 STARTTIME=$(date +%s)
 OS_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${OS_ROOT}/hack/text.sh"
+source "${OS_ROOT}/hack/lib/init.sh"
 origin_path="src/github.com/openshift/origin"
 
 # TODO: Remove this check and fix the docker command instead after the

Diff for: hack/build-release.sh

@@ -11,8 +11,7 @@ set -o pipefail
 
 STARTTIME=$(date +%s)
 OS_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${OS_ROOT}/hack/common.sh"
-source "${OS_ROOT}/hack/util.sh"
+source "${OS_ROOT}/hack/lib/init.sh"
 os::log::install_errexit
 
 # Go to the top of the tree.

Diff for: hack/cherry-pick.sh

@@ -7,8 +7,7 @@ set -o nounset
 set -o pipefail
 
 OS_ROOT=$(dirname "${BASH_SOURCE}")/..
-source "${OS_ROOT}/hack/common.sh"
-source "${OS_ROOT}/hack/util.sh"
+source "${OS_ROOT}/hack/lib/init.sh"
 os::log::install_errexit
 
 # Go to the top of the tree.