openstack
/
magnum
Code Issues Proposed changes

Merge "Duplicated parameter definition in template"

This commit is contained in:
Jenkins 2016-06-07 21:04:05 +00:00 committed by Gerrit Code Review
parent df6b16039c 275d6f5ee2
commit 70fed16ba3
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
magnum/templates/kubernetes/kubeminion.yaml
View File

@ -134,12 +134,6 @@ parameters:
type: string
description: an alternative term for a project
auth_url:
type: string
description: >
url for kubernetes to authenticate before sending request to neutron
must be v2 since kubernetes backend only suppor v2 at this point
username:
type: string
description: >
@ -192,7 +186,9 @@ parameters:
auth_url:
type: string
description: url for keystone
description: >
url for keystone, must be v2 since k8s backend only support v2
at this point
insecure_registry_url:
type: string
@ -241,7 +237,6 @@ resources:
$TLS_DISABLED: {get_param: tls_disabled}
$BAY_UUID: {get_param: bay_uuid}
$MAGNUM_URL: {get_param: magnum_url}
$AUTH_URL: {get_param: auth_url}
$USERNAME: {get_param: username}
$PASSWORD: {get_param: password}
$VOLUME_DRIVER: {get_param: volume_driver}