From 97a939f7aeef6c67fb16ece11f9f39f082368ba5 Mon Sep 17 00:00:00 2001 From: Eli Qiao Date: Mon, 28 Mar 2016 11:32:56 +0800 Subject: [PATCH] Cleanup duplicated auth_url in k8scluster/master template Cleanup duplicated auth_url in k8scluster/master template. Change-Id: I83120436a520261d7e19a0c7790e96ffb276d87d --- magnum/templates/kubernetes/kubecluster.yaml | 1 - magnum/templates/kubernetes/kubemaster.yaml | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/magnum/templates/kubernetes/kubecluster.yaml b/magnum/templates/kubernetes/kubecluster.yaml index edf2a090eb..5dbb042368 100644 --- a/magnum/templates/kubernetes/kubecluster.yaml +++ b/magnum/templates/kubernetes/kubecluster.yaml @@ -446,7 +446,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} diff --git a/magnum/templates/kubernetes/kubemaster.yaml b/magnum/templates/kubernetes/kubemaster.yaml index 94cb3ab8a0..042643d2c0 100644 --- a/magnum/templates/kubernetes/kubemaster.yaml +++ b/magnum/templates/kubernetes/kubemaster.yaml @@ -129,7 +129,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: > @@ -175,9 +175,6 @@ parameters: default: "" hidden: true - auth_url: - type: string - description: url for keystone resources: @@ -234,7 +231,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