Merge pull request #7072 from dchen1107/cleanup

Remove fqdn dependency for node name
2015-04-20 18:00:21 -07:00
parent 9f89043d8b 5eda3fe9a9
commit 1be193098a
8 changed files with 8 additions and 35 deletions
--- a/cluster/saltbase/salt/generate-cert/make-ca-cert.sh
+++ b/cluster/saltbase/salt/generate-cert/make-ca-cert.sh
@@ -36,7 +36,7 @@ if [ "$cert_ip" == "_use_aws_external_ip_" ]; then
 fi

 if [ "$cert_ip" == "_use_azure_dns_name_" ]; then
-  cert_ip=$(hostname -f | awk -F. '{ print $2 }').cloudapp.net
+  cert_ip=$(uname -n | awk -F. '{ print $2 }').cloudapp.net
  use_cn=true
 fi