Merge pull request #12695 from stevekuznetsov/skuznets/etcd-curl

Merged by openshift-bot
openshift · Jan 28, 2017 · 6ceb412 · 6ceb412
2 parents 8dd59d9 + 2138ec0
commit 6ceb412
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/hack/lib/util/misc.sh b/hack/lib/util/misc.sh
@@ -183,11 +183,10 @@ function os::util::curl_etcd() {
 
 		curl --fail --silent --cacert "${ca_bundle}" \
 		     --cert "${etcd_client_cert_p12}:${etcd_client_cert_p12_password}" "${full_url}"
+	else
+		curl --fail --silent --cacert "${ca_bundle}" \
+		     --cert "${etcd_client_cert}" --key "${etcd_client_key}" "${full_url}"
 	fi
-
-
-	curl --fail --silent --cacert "${ca_bundle}" \
-	     --cert "${etcd_client_cert}" --key "${etcd_client_key}" "${full_url}"
 }
 
 # os::util::host_platform determines what the host OS and architecture