github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add braces around environment variable names 

Parameter names of Heat str_replace remain unchanged
pull/6/head
OHTAKE Tomohiro 2016-04-25 10:40:57 +09:00 committed by Lukasz Zajaczkowski
parent 7f37ab5034
commit 23bcbbfaca
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/openstack/kubernetes-heat/fragments/configure-proxy.sh
View File

@ -63,8 +63,8 @@ ENABLE_PROXY='$ENABLE_PROXY'
if [[ "${ENABLE_PROXY}" == "true" ]]; then
mkdir -p /etc/systemd/system/docker.service.d/
echo "$ETC_ENVIRONMENT" >> /etc/environment
echo "$ETC_PROFILE_D" > /etc/profile.d/proxy_config.sh
echo "$DOCKER_PROXY" > etc/systemd/system/docker.service.d/http-proxy.conf
echo "${ETC_ENVIRONMENT}" >> /etc/environment
echo "${ETC_PROFILE_D}" > /etc/profile.d/proxy_config.sh
echo "${DOCKER_PROXY}" > etc/systemd/system/docker.service.d/http-proxy.conf
echo "proxy=$HTTP_PROXY" >> /etc/yum.conf
fi

4
cluster/openstack/kubernetes-heat/fragments/run-salt.sh
View File

@ -29,8 +29,8 @@ rm -rf /kube-install
mkdir -p /kube-install
cd /kube-install
curl "$KUBERNETES_SERVER_URL" -o kubernetes-server.tar.gz
curl "$KUBERNETES_SALT_URL" -o kubernetes-salt.tar.gz
curl "${KUBERNETES_SERVER_URL}" -o kubernetes-server.tar.gz
curl "${KUBERNETES_SALT_URL}" -o kubernetes-salt.tar.gz
tar xzf kubernetes-salt.tar.gz
./kubernetes/saltbase/install.sh kubernetes-server.tar.gz

14
cluster/openstack/util.sh
View File

@ -24,7 +24,7 @@ set -e
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
readonly ROOT=$(dirname "${BASH_SOURCE}")
source "${ROOT}/${KUBE_CONFIG_FILE:-"config-default.sh"}"
source "$KUBE_ROOT/cluster/common.sh"
source "${KUBE_ROOT}/cluster/common.sh"
if [ $CREATE_IMAGE = true ]; then
source "${ROOT}/config-image.sh"
fi
@ -35,10 +35,10 @@ function verify-prereqs() {
for client in swift glance nova heat;
do
if which $client >/dev/null 2>&1; then
echo "$client client installed"
echo "${client} client installed"
else
echo "$client client does not exist"
echo "Please install $client client, and retry."
echo "${client} client does not exist"
echo "Please install ${client} client, and retry."
exit 1
fi
done
@ -49,7 +49,7 @@ function verify-prereqs() {
# Assumed vars:
# KUBERNETES_PROVIDER
function kube-up() {
echo "kube-up for provider $KUBERNETES_PROVIDER"
echo "kube-up for provider ${KUBERNETES_PROVIDER}"
create-stack
}
@ -186,7 +186,7 @@ function run-heat-script() {
if [ $CREATE_IMAGE = true ]; then
echo "[INFO] Retrieve new image ID"
IMAGE_ID=$(nova image-show ${OPENSTACK_IMAGE_NAME} | awk '$2=="id" {print $4}')
echo "[INFO] Image Id $IMAGE_ID"
echo "[INFO] Image Id ${IMAGE_ID}"
fi
if [[ ! $stack_status ]]; then
@ -270,5 +270,5 @@ function detect-master {
export KUBE_MASTER_IP=$(nova show "${STACK_NAME}"-master | awk '$3=="network" {print $6}')
echo "KUBE_MASTER_IP: $KUBE_MASTER_IP" 1>&2
echo "KUBE_MASTER_IP: ${KUBE_MASTER_IP}" 1>&2
}