[ACS] Remove k8s-master from dns names (Azure#1444)

* Remove k8s-master from dns names * Rebase.
chinazhangchao · Dec 4, 2016 · 995a395 · 995a395
1 parent a317d18
commit 995a395
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/custom.py b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/custom.py
@@ -287,7 +287,7 @@ def acs_create(resource_group_name, deployment_name, dns_name_prefix, name, ssh_
                 client_secret = binascii.b2a_hex(os.urandom(10)).decode('utf-8')
             store_acs_service_principal(client_secret, None)
             salt = binascii.b2a_hex(os.urandom(3)).decode('utf-8')
-            url = 'http://{}.{}-k8s-masters.{}.cloudapp.azure.com'.format(salt, dns_name_prefix, location)
+            url = 'http://{}.{}.{}.cloudapp.azure.com'.format(salt, dns_name_prefix, location)
 
             service_principal = _build_service_principal(name, url, client_secret)
             logger.info('Created a service principal: %s', service_principal)
@@ -339,14 +339,14 @@ def _create_kubernetes(resource_group_name, deployment_name, dns_name_prefix, na
                     },
                     "masterProfile": {
                         "count": 1,
-                        "dnsPrefix": dns_name_prefix + '-k8s-masters'
+                        "dnsPrefix": dns_name_prefix
                     },
                     "agentPoolProfiles": [
                         {
                             "name": "agentpools",
                             "count": agent_count,
                             "vmSize": agent_vm_size,
-                            "dnsPrefix": dns_name_prefix + '-k8s-agents',
+                            "dnsPrefix": dns_name_prefix + '-k8s-agents'
                         }
                     ],
                     "linuxProfile": {