Merge "Cleanup duplicated auth_url in k8scluster/master template"

magnum/templates/kubernetes/kubecluster.yaml

@@ -445,7 +445,6 @@ resources:
           fixed_subnet: {get_resource: fixed_subnet}
           api_pool_id: {get_resource: api_pool}
           etcd_pool_id: {get_resource: etcd_pool}
-          auth_url: {get_param: auth_url}
           username: {get_param: username}
           password: {get_param: password}
           tenant_name: {get_param: tenant_name}

magnum/templates/kubernetes/kubemaster.yaml

@@ -128,7 +128,7 @@ parameters:
   auth_url:
     type: string
     description: >
-      url for kubernetes to authenticate before sending request to neutron
+      url for kubernetes to authenticate
   username:
     type: string
     description: >
@@ -174,9 +174,6 @@ parameters:
     default: ""
     hidden: true
 
-  auth_url:
-    type: string
-    description: url for keystone
 
 resources:
 
@@ -233,7 +230,6 @@ resources:
             "$TRUSTEE_USER_ID": {get_param: trustee_user_id}
             "$TRUSTEE_PASSWORD": {get_param: trustee_password}
             "$TRUST_ID": {get_param: trust_id}
-            "$AUTH_URL": {get_param: auth_url}
 
   make_cert:
     type: OS::Heat::SoftwareConfig