Merge pull request kubernetes#37193 from gmarek/event-disk

Automatic merge from submit-queue Pass GCLOUD_COMMON_ARGS do disk attach in Kubemark
gmarek · Nov 21, 2016 · da00748 · da00748
2 parents ab184e1 + 87f8720
commit da00748
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh
@@ -118,7 +118,10 @@ run-gcloud-compute-with-retries instances create "${MASTER_NAME}" \
 
 if [ "${EVENT_PD:-false}" == "true" ]; then
   echo "Attaching ${MASTER_NAME}-event-pd to ${MASTER_NAME}"
-  run-gcloud-compute-with-retries instances attach-disk "${MASTER_NAME}" --disk "${MASTER_NAME}-event-pd" --device-name="master-event-pd"
+  run-gcloud-compute-with-retries instances attach-disk "${MASTER_NAME}" \
+  ${GCLOUD_COMMON_ARGS} \
+  --disk "${MASTER_NAME}-event-pd" \
+  --device-name="master-event-pd"
 fi
 
 run-gcloud-compute-with-retries firewall-rules create "${INSTANCE_PREFIX}-kubemark-master-https" \