Merge branch 'master' into migration

yangl900 · May 14, 2017 · e64b446 · e64b446
2 parents 87c56c3 + 253dd41
commit e64b446
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 32 deletions.
diff --git a/examples/dcos-versions/dcos1.7.3.json b/examples/dcos-versions/dcos1.7.3.json
@@ -2,7 +2,8 @@
   "apiVersion": "vlabs",
   "properties": {
     "orchestratorProfile": {
-      "orchestratorType": "DCOS173"
+      "orchestratorType": "DCOS",
+      "orchestratorVersion": "1.7.3"
     },
     "masterProfile": {
       "count": 1,

diff --git a/examples/dcos-versions/dcos1.8.4.json b/examples/dcos-versions/dcos1.8.4.json
@@ -2,7 +2,8 @@
   "apiVersion": "vlabs",
   "properties": {
     "orchestratorProfile": {
-      "orchestratorType": "DCOS184"
+      "orchestratorType": "DCOS",
+      "orchestratorVersion": "1.8.4"
     },
     "masterProfile": {
       "count": 3,

diff --git a/examples/dcos-versions/dcos1.8.8.json b/examples/dcos-versions/dcos1.8.8.json
@@ -2,7 +2,8 @@
   "apiVersion": "vlabs",
   "properties": {
     "orchestratorProfile": {
-      "orchestratorType": "DCOS188"
+      "orchestratorType": "DCOS",
+      "orchestratorVersion": "1.8.8"
     },
     "masterProfile": {
       "count": 3,

diff --git a/examples/dcos-versions/dcos1.9.0.json b/examples/dcos-versions/dcos1.9.0.json
@@ -2,7 +2,8 @@
   "apiVersion": "vlabs",
   "properties": {
     "orchestratorProfile": {
-      "orchestratorType": "DCOS190"
+      "orchestratorType": "DCOS",
+      "orchestratorVersion": "1.9.0"
     },
     "masterProfile": {
       "count": 3,

diff --git a/examples/scale-up/kubernetes_template.json b/examples/scale-up/kubernetes_template.json
@@ -881,9 +881,9 @@
       "type": "string"
     },
     "targetEnvironment": {
-      "defaultValue": "AzureCloud",
+      "defaultValue": "AzurePublicCloud",
       "metadata": {
-        "description": "The azure deploy environment. Currently support: AzureCloud, AzureChinaCloud"
+        "description": "The azure deploy environment. Currently support: AzurePublicCloud, AzureChinaCloud"
       },
       "type": "string"
     }

diff --git a/examples/scale-up/kubernetes_update_template.json b/examples/scale-up/kubernetes_update_template.json
@@ -881,9 +881,9 @@
       "type": "string"
     },
     "targetEnvironment": {
-      "defaultValue": "AzureCloud",
+      "defaultValue": "AzurePublicCloud",
       "metadata": {
-        "description": "The azure deploy environment. Currently support: AzureCloud, AzureChinaCloud"
+        "description": "The azure deploy environment. Currently support: AzurePublicCloud, AzureChinaCloud"
       },
       "type": "string"
     }

diff --git a/parts/configure-swarm-cluster.sh b/parts/configure-swarm-cluster.sh
@@ -36,25 +36,6 @@ echo "AZUREUSER: $AZUREUSER"
 
 ensureAzureNetwork()
 {
-  # ensure the host name is resolvable
-  hostResolveHealthy=1
-  for i in {1..120}; do
-    host $VMNAME
-    if [ $? -eq 0 ]
-    then
-      # hostname has been found continue
-      hostResolveHealthy=0
-      echo "the host name resolves"
-      break
-    fi
-    sleep 1
-  done
-  if [ $hostResolveHealthy -ne 0 ]
-  then
-    echo "host name does not resolve, aborting install"
-    exit 1
-  fi
-
   # ensure the network works
   networkHealthy=1
   for i in {1..12}; do
@@ -88,6 +69,20 @@ ensureAzureNetwork()
     fi
     sleep 1
   done
+  # attempt to fix hostname, in case dns is not resolving Azure IPs (but can resolve public ips)
+  if [ $networkHealthy -ne 0 ]
+  then
+    HOSTNAME=`hostname`
+    HOSTADDR=`ip address show dev eth0 | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*'`
+    echo $HOSTADDR $HOSTNAME >> /etc/hosts
+    hostname -i
+    if [ $? -eq 0 ]
+    then
+      # hostname has been found continue
+      networkHealthy=0
+      echo "the network is healthy by updating /etc/hosts"
+    fi
+  fi
   if [ $networkHealthy -ne 0 ]
   then
     echo "the network is not healthy, cannot resolve ip address, aborting install"

diff --git a/parts/configure-swarmmode-cluster.sh b/parts/configure-swarmmode-cluster.sh
@@ -78,6 +78,20 @@ ensureAzureNetwork()
     fi
     sleep 1
   done
+  # attempt to fix hostname, in case dns is not resolving Azure IPs (but can resolve public ips)
+  if [ $networkHealthy -ne 0 ]
+  then
+    HOSTNAME=`hostname`
+    HOSTADDR=`ip address show dev eth0 | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*'`
+    echo $HOSTADDR $HOSTNAME >> /etc/hosts
+    hostname -i
+    if [ $? -eq 0 ]
+    then
+      # hostname has been found continue
+      networkHealthy=0
+      echo "the network is healthy by updating /etc/hosts"
+    fi
+  fi
   if [ $networkHealthy -ne 0 ]
   then
     echo "the network is not healthy, cannot resolve ip address, aborting install"

diff --git a/parts/masterparams.t b/parts/masterparams.t
@@ -54,9 +54,9 @@
       "type": "string"
     },
     "targetEnvironment": {
-      "defaultValue": "AzureCloud",
+      "defaultValue": "AzurePublicCloud",
       "metadata": {
-        "description": "The azure deploy environment. Currently support: AzureCloud, AzureChinaCloud"
+        "description": "The azure deploy environment. Currently support: AzurePublicCloud, AzureChinaCloud"
       },
       "type": "string"
     },

diff --git a/pkg/acsengine/templates.go b/pkg/acsengine/templates.go