Do not use 'exit' in the script
The scripts in kube_cluster_config SoftwareConfig resource are combined together as one script inside the VM, any 'exit' clause will stop executing the following script. Change-Id: I25965c663e6e1ca5a59d0f28098174810bd76df1
This commit is contained in:
parent
6e19837ad1
commit
49d0444974
|
@ -78,22 +78,17 @@ subjects:
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
kubectl apply --validate=false -f ${ADMIN_RBAC}
|
kubectl apply --validate=false -f ${ADMIN_RBAC}
|
||||||
|
|
||||||
if [ -z "${TRUST_ID}" ] || [ "$(echo "${CLOUD_PROVIDER_ENABLED}" | tr '[:upper:]' '[:lower:]')" != "true" ]; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
#TODO: add heat variables for master count to determine leaderelect true/False ?
|
#TODO: add heat variables for master count to determine leaderelect true/False ?
|
||||||
|
if [ -n "${TRUST_ID}" ] && [ "$(echo "${CLOUD_PROVIDER_ENABLED}" | tr '[:upper:]' '[:lower:]')" = "true" ]; then
|
||||||
|
occm_image="${CONTAINER_INFRA_PREFIX:-docker.io/k8scloudprovider/}openstack-cloud-controller-manager:${CLOUD_PROVIDER_TAG}"
|
||||||
|
OCCM=/srv/magnum/kubernetes/openstack-cloud-controller-manager.yaml
|
||||||
|
|
||||||
occm_image="${CONTAINER_INFRA_PREFIX:-docker.io/k8scloudprovider/}openstack-cloud-controller-manager:${CLOUD_PROVIDER_TAG}"
|
[ -f ${OCCM} ] || {
|
||||||
|
echo "Writing File: ${OCCM}"
|
||||||
OCCM=/srv/magnum/kubernetes/openstack-cloud-controller-manager.yaml
|
mkdir -p $(dirname ${OCCM})
|
||||||
[ -f ${OCCM} ] || {
|
cat << EOF > ${OCCM}
|
||||||
echo "Writing File: ${OCCM}"
|
|
||||||
mkdir -p $(dirname ${OCCM})
|
|
||||||
cat << EOF > ${OCCM}
|
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
|
@ -317,7 +312,9 @@ spec:
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
node-role.kubernetes.io/master: ""
|
node-role.kubernetes.io/master: ""
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
kubectl apply -f ${OCCM}
|
||||||
|
fi
|
||||||
|
|
||||||
kubectl create -f ${OCCM}
|
|
||||||
printf "Finished running ${step}\n"
|
printf "Finished running ${step}\n"
|
||||||
|
|
Loading…
Reference in New Issue