Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Commit

Permalink
deployer install: lowercase some variables
Browse files Browse the repository at this point in the history
Fix openshift/origin-aggregated-logging#224
which notes that several variables are referred to in the install script
in uppercase which only works if they were passed in as env vars, not
via the configmap. Now the lowercase, mapped versions are used.
  • Loading branch information
sosiouxme authored and Anton Sherkhonov committed Sep 22, 2016
1 parent 4031507 commit 2c0921f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions deployer/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -388,9 +388,9 @@ function generate_es() {
pvcs["$pvc"]=1 # note, map all that exist, not just ones labeled as supporting
done
for ((n=1;n<=${es_cluster_size};n++)); do
pvc="${ES_PVC_PREFIX}$n"
if [ "${pvcs[$pvc]}" != 1 -a "${ES_PVC_SIZE}" != "" ]; then # doesn't exist, create it
oc new-app logging-pvc-${es_pvc_dynamic:+"dynamic-"}template -p "NAME=$pvc,SIZE=${ES_PVC_SIZE}"
pvc="${es_pvc_prefix}$n"
if [ "${pvcs[$pvc]}" != 1 -a "${es_pvc_size}" != "" ]; then # doesn't exist, create it
oc new-app logging-pvc-${es_pvc_dynamic:+"dynamic-"}template -p "NAME=$pvc,SIZE=${es_pvc_size}"
pvcs["$pvc"]=1
fi
if [ "${pvcs[$pvc]}" = 1 ]; then # exists (now), attach it
Expand All @@ -405,9 +405,9 @@ function generate_es() {

if [ "${input_vars[enable-ops-cluster]}" == true ]; then
for ((n=1;n<=${es_ops_cluster_size};n++)); do
pvc="${ES_OPS_PVC_PREFIX}$n"
if [ "${pvcs[$pvc]}" != 1 -a "${ES_OPS_PVC_SIZE}" != "" ]; then # doesn't exist, create it
oc new-app logging-pvc-${es_ops_pvc_dynamic:+"dynamic-"}template -p "NAME=$pvc,SIZE=${ES_OPS_PVC_SIZE}"
pvc="${es_ops_pvc_prefix}$n"
if [ "${pvcs[$pvc]}" != 1 -a "${es_ops_pvc_size}" != "" ]; then # doesn't exist, create it
oc new-app logging-pvc-${es_ops_pvc_dynamic:+"dynamic-"}template -p "NAME=$pvc,SIZE=${es_ops_pvc_size}"
pvcs["$pvc"]=1
fi
if [ "${pvcs[$pvc]}" = 1 ]; then # exists (now), attach it
Expand Down

0 comments on commit 2c0921f

Please sign in to comment.