openstack/openstack-helm
Code Issues Proposed changes

gate: expose timeouts for node and pod startup

Browse Source 
Change-Id: I98da4768c438cb1801cf481a229a1a0f74df1415
This commit is contained in:
Chris Wedgwood 2017-09-15 16:27:35 +00:00
parent ae4da1e7ef
commit e6cdfcdd07
6 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/gate/funcs/kube.sh
View File

@ -122,8 +122,8 @@ function kubeadm_aio_launch {
${WORK_DIR}/tools/kubeadm-aio/kubeadm-aio-launcher.sh
mkdir -p ${HOME}/.kube
cat ${KUBECONFIG} > ${HOME}/.kube/config
kube_wait_for_pods kube-system ${POD_START_TIMEOUT}
kube_wait_for_pods default 240
kube_wait_for_pods kube-system ${POD_START_TIMEOUT_SYSTEM}
kube_wait_for_pods default ${POD_START_TIMEOUT_DEFAULT}
}
function kubeadm_aio_clean {

4
tools/gate/launch-osh/armada.sh
View File

@ -40,8 +40,8 @@ sudo docker run -d \
sudo docker exec armada armada tiller --status
sudo docker exec armada armada apply ${ARMADA_MANIFEST}
sudo docker rm -f armada
kube_wait_for_pods ceph 600
kube_wait_for_pods openstack 1200
kube_wait_for_pods ceph ${POD_START_TIMEOUT_CEPH}
kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}
MON_POD=$(kubectl get pods -l application=ceph -l component=mon -n ceph --no-headers | awk '{ print $1; exit }')
kubectl exec -n ceph ${MON_POD} -- ceph -s

24
tools/gate/launch-osh/basic.sh
View File

@ -60,7 +60,7 @@ if [ "x$PVC_BACKEND" == "xceph" ]; then
--set bootstrap.enabled=true
fi
kube_wait_for_pods ceph ${SERVICE_LAUNCH_TIMEOUT}
kube_wait_for_pods ceph ${POD_START_TIMEOUT_CEPH}
MON_POD=$(kubectl get pods \
--namespace=ceph \
@ -83,7 +83,7 @@ if [ "x$PVC_BACKEND" == "xceph" ]; then
--set deployment.client_secrets=true \
--set deployment.rgw_keystone_user_and_endpoints=false
kube_wait_for_pods openstack ${SERVICE_LAUNCH_TIMEOUT}
kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}
fi
helm install --namespace=openstack ${WORK_DIR}/ingress --name=ingress
@ -94,10 +94,10 @@ else
--set pod.replicas.server=1
fi
helm install --namespace=openstack ${WORK_DIR}/memcached --name=memcached
kube_wait_for_pods openstack ${SERVICE_LAUNCH_TIMEOUT}
kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}
helm install --namespace=openstack ${WORK_DIR}/keystone --name=keystone
kube_wait_for_pods openstack ${SERVICE_LAUNCH_TIMEOUT}
kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}
if [ "x$OPENSTACK_OBJECT_STORAGE" == "xradosgw" ]; then
helm install --namespace=openstack ${WORK_DIR}/ceph --name=radosgw-openstack \
@ -112,7 +112,7 @@ if [ "x$OPENSTACK_OBJECT_STORAGE" == "xradosgw" ]; then
--set deployment.rbd_provisioner=false \
--set deployment.client_secrets=false \
--set deployment.rgw_keystone_user_and_endpoints=true
kube_wait_for_pods openstack ${SERVICE_LAUNCH_TIMEOUT}
kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}
fi
helm install --namespace=openstack ${WORK_DIR}/etcd --name=etcd-rabbitmq
@ -124,13 +124,13 @@ if [[ "x${PVC_BACKEND}" != "xceph" ]] && [[ "x${GLANCE}" != "xpvc" ]] ; then
fi
helm install --namespace=openstack ${WORK_DIR}/glance --name=glance \
--set storage=${GLANCE}
kube_wait_for_pods openstack ${SERVICE_LAUNCH_TIMEOUT}
kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}
helm install --namespace=openstack ${WORK_DIR}/libvirt --name=libvirt
if [ "x$SDN_PLUGIN" == "xovs" ]; then
helm install --namespace=openstack ${WORK_DIR}/openvswitch --name=openvswitch
fi
kube_wait_for_pods openstack ${SERVICE_LAUNCH_TIMEOUT}
kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}
if [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then
helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \
@ -164,10 +164,10 @@ elif [ "x$PVC_BACKEND" == "x" ] && [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; then
--values=${WORK_DIR}/tools/overrides/mvp/neutron-linuxbridge.yaml
fi
kube_wait_for_pods openstack ${SERVICE_LAUNCH_TIMEOUT}
kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}
helm install --namespace=openstack ${WORK_DIR}/heat --name=heat
kube_wait_for_pods openstack ${SERVICE_LAUNCH_TIMEOUT}
kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}
if [ "x$INTEGRATION" == "xmulti" ]; then
if [ "x$PVC_BACKEND" == "xceph" ]; then
@ -177,15 +177,15 @@ if [ "x$INTEGRATION" == "xmulti" ]; then
--values=${WORK_DIR}/tools/overrides/mvp/cinder.yaml
fi
helm install --namespace=openstack ${WORK_DIR}/horizon --name=horizon
kube_wait_for_pods openstack ${SERVICE_LAUNCH_TIMEOUT}
kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}
helm install --namespace=openstack ${WORK_DIR}/barbican --name=barbican
helm install --namespace=openstack ${WORK_DIR}/magnum --name=magnum
kube_wait_for_pods openstack ${SERVICE_LAUNCH_TIMEOUT}
kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}
helm install --namespace=openstack ${WORK_DIR}/mistral --name=mistral
helm install --namespace=openstack ${WORK_DIR}/senlin --name=senlin
kube_wait_for_pods openstack ${SERVICE_LAUNCH_TIMEOUT}
kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}
helm_test_deployment keystone ${SERVICE_TEST_TIMEOUT}
helm_test_deployment glance ${SERVICE_TEST_TIMEOUT}

2
tools/gate/launch-osh/common.sh
View File

@ -35,4 +35,4 @@ elif [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; then
fi
helm install --namespace=openstack ${WORK_DIR}/dns-helper --name=dns-helper
kube_wait_for_pods openstack 180
kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}

6
tools/gate/setup_gate_worker_nodes.sh
View File

@ -43,9 +43,9 @@ bash ${SUB_NODE_PROVISION_SCRIPT}
rm -rf ${SUB_NODE_PROVISION_SCRIPT}
source ${WORK_DIR}/tools/gate/funcs/kube.sh
kube_wait_for_nodes ${SUB_NODE_COUNT} 240
kube_wait_for_pods kube-system ${POD_START_TIMEOUT}
kube_wait_for_pods openstack 240
kube_wait_for_nodes ${SUB_NODE_COUNT} ${NODE_START_TIMEOUT}
kube_wait_for_pods kube-system ${POD_START_TIMEOUT_SYSTEM}
kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}
kubectl get nodes --show-all
kubectl get --all-namespaces all --show-all
sudo docker exec kubeadm-aio openstack-helm-dev-prep

7
tools/gate/vars.sh
View File

@ -52,8 +52,11 @@ export SDN_PLUGIN=${SDN_PLUGIN:-"ovs"}
export UPSTREAM_DNS=${UPSTREAM_DNS:-"8.8.8.8"}
# Set gate script timeouts
export POD_START_TIMEOUT=${POD_START_TIMEOUT:="480"}
export SERVICE_LAUNCH_TIMEOUT=${SERVICE_LAUNCH_TIMEOUT:="600"}
export NODE_START_TIMEOUT=${NODE_START_TIMEOUT:="480"}
export POD_START_TIMEOUT_SYSTEM=${POD_START_TIMEOUT_SYSTEM:="480"}
export POD_START_TIMEOUT_OPENSTACK=${POD_START_TIMEOUT_OPENSTACK:="600"}
export POD_START_TIMEOUT_DEFAULT=${POD_START_TIMEOUT_DEFAULT:="480"}
export POD_START_TIMEOUT_CEPH=${POD_START_TIMEOUT_CEPH:="600"}
export SERVICE_TEST_TIMEOUT=${SERVICE_TEST_TIMEOUT:="600"}
# Setup Loopback device options