openstack
/
magnum
Code Issues Proposed changes

Format template 

Format template and remove default from sub_template.

Change-Id: Ia9b4ae2553614d6c2ff695558f491aa24e475eaa
This commit is contained in:
Hua Wang 2016-04-11 11:17:51 +08:00
parent 705f517d66
commit 779c4b0c89
9 changed files with 36 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
magnum/templates/kubernetes/kubemaster-coreos.yaml
View File

@ -13,7 +13,6 @@ parameters:
master_flavor:
type: string
default: m1.small
description: flavor to use when booting the server
ssh_key_name:
@ -23,7 +22,6 @@ parameters:
external_network:
type: string
description: uuid/name of a network to use for floating ip addresses
default: public
discovery_url:
type: string
@ -33,37 +31,31 @@ parameters:
dns_nameserver:
type: string
description: address of a dns nameserver reachable in your environment
default: 8.8.8.8
portal_network_cidr:
type: string
description: >
address range used by kubernetes for service portals
default: 10.254.0.0/16
kube_allow_priv:
type: string
description: >
whether or not kubernetes should permit privileged containers.
default: "true"
constraints:
- allowed_values: ["true", "false"]
flannel_network_cidr:
type: string
description: network range for flannel overlay network
default: 10.100.0.0/16
flannel_network_subnetlen:
type: string
description: size of subnet assigned to each master
default: 24
flannel_backend:
type: string
description: >
specify the backend for flannel, default udp backend
default: "udp"
constraints:
- allowed_values: ["udp", "vxlan", "host-gw"]
@ -77,7 +69,6 @@ parameters:
wait_condition_timeout:
type: number
default: 6000
description : >
timeout for the Wait Conditions
@ -88,14 +79,12 @@ parameters:
tls_disabled:
type: boolean
description: whether or not to enable TLS
default: False
kubernetes_port:
type: number
description: >
The port which are used by kube-apiserver to provide Kubernetes
service.
default: 8080
kube_version:
type: string

8
magnum/templates/kubernetes/kubemaster-fedora-ironic.yaml
View File

@ -21,35 +21,29 @@ parameters:
server_image:
type: string
default: fedora-k8s
description: glance image used to boot the server
master_flavor:
type: string
default: baremetal
description: flavor to use when booting the server
portal_network_cidr:
type: string
description: >
address range used by kubernetes for service portals
default: 10.254.0.0/16
flannel_network_cidr:
type: string
description: network range for flannel overlay network
default: 10.100.0.0/16
flannel_network_subnetlen:
type: string
description: size of subnet assigned to each minion
default: 24
flannel_backend:
type: string
description: >
specify the backend for flannel, default udp backend
default: "udp"
constraints:
- allowed_values: ["udp", "vxlan", "host-gw"]
@ -57,7 +51,6 @@ parameters:
type: string
description: >
whether or not kubernetes should permit privileged containers.
default: "true"
constraints:
- allowed_values: ["true", "false"]
@ -65,7 +58,6 @@ parameters:
type: number
description : >
timeout for the Wait Conditions
default: 6000
auth_url:
type: string

35
magnum/templates/kubernetes/kubemaster.yaml
View File

@ -13,13 +13,11 @@ parameters:
master_flavor:
type: string
default: m1.small
description: flavor to use when booting the server
ssh_key_name:
type: string
description: name of ssh key to be provisioned on our server
default: lars
external_network:
type: string
@ -29,13 +27,11 @@ parameters:
type: string
description: >
address range used by kubernetes for service portals
default: 10.254.0.0/16
kube_allow_priv:
type: string
description: >
whether or not kubernetes should permit privileged containers.
default: "false"
constraints:
- allowed_values: ["true", "false"]
@ -44,23 +40,19 @@ parameters:
description: >
size of a cinder volume to allocate to docker for container/image
storage
default: 25
flannel_network_cidr:
type: string
description: network range for flannel overlay network
default: 10.100.0.0/16
flannel_network_subnetlen:
type: string
description: size of subnet assigned to each master
default: 24
flannel_backend:
type: string
description: >
specify the backend for flannel, default udp backend
default: "udp"
constraints:
- allowed_values: ["udp", "vxlan", "host-gw"]
@ -72,14 +64,12 @@ parameters:
tls_disabled:
type: boolean
description: whether or not to enable TLS
default: False
kubernetes_port:
type: number
description: >
The port which are used by kube-apiserver to provide Kubernetes
service.
default: 6443
bay_uuid:
type: string
@ -89,66 +79,79 @@ parameters:
type: string
description: endpoint to retrieve TLS certs from
# The following are all generated in the parent template.
api_public_address:
type: string
description: Public IP address of the Kubernetes master server.
api_private_address:
type: string
description: Private IP address of the Kubernetes master server.
fixed_network:
type: string
description: Network from which to allocate fixed addresses.
fixed_subnet:
type: string
description: Subnet from which to allocate fixed addresses.
network_driver:
type: string
description: network driver to use for instantiating container networks
wait_condition_timeout:
type: number
description : >
timeout for the Wait Conditions
secgroup_base_id:
type: string
description: ID of the security group for base.
secgroup_kube_master_id:
type: string
description: ID of the security group for kubernetes master.
api_pool_id:
type: string
description: ID of the load balancer pool of k8s API server.
etcd_pool_id:
type: string
description: ID of the load balancer pool of etcd server.
auth_url:
type: string
description: >
url for kubernetes to authenticate
username:
type: string
description: >
user account
password:
type: string
description: >
user password
tenant_name:
type: string
description: >
tenant name
http_proxy:
type: string
description: http proxy address for docker
default: ""
https_proxy:
type: string
description: https proxy address for docker
default: ""
no_proxy:
type: string
description: no proxies for docker
default: ""
kube_version:
type: string
description: version of kubernetes used for kubernetes cluster
@ -156,21 +159,17 @@ parameters:
trustee_user_id:
type: string
description: user id of the trustee
default: ""
trustee_password:
type: string
description: password of the trustee
default: ""
hidden: true
trust_id:
type: string
description: id of the trust which is used by the trustee
default: ""
hidden: true
resources:
master_wait_handle:

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

@ -9,18 +9,15 @@ parameters:
server_image:
type: string
default: CoreOS
description: glance image used to boot the server
minion_flavor:
type: string
default: m1.small
description: flavor to use when booting the server
ssh_key_name:
type: string
description: name of ssh key to be provisioned on our server
default: testkey
external_network:
type: string
@ -30,7 +27,6 @@ parameters:
type: string
description: >
whether or not kubernetes should permit privileged containers.
default: "false"
constraints:
- allowed_values: ["true", "false"]
@ -41,32 +37,33 @@ parameters:
tls_disabled:
type: boolean
description: whether or not to enable TLS
default: False
kubernetes_port:
type: number
description: >
The port which are used by kube-apiserver to provide Kubernetes
service.
default: 8080
kube_version:
type: string
description: version of kubernetes used for kubernetes cluster
# The following are all generated in the parent template.
kube_master_ip:
type: string
description: IP address of the Kubernetes master server.
etcd_server_ip:
type: string
description: IP address of the Etcd server.
fixed_network:
type: string
description: Network from which to allocate fixed addresses.
fixed_subnet:
type: string
description: Subnet from which to allocate fixed addresses.
flannel_network_cidr:
type: string
description: network range for flannel overlay network

7
magnum/templates/kubernetes/kubeminion-fedora-ironic.yaml
View File

@ -13,13 +13,11 @@ parameters:
minion_flavor:
type: string
default: m1.small
description: flavor to use when booting the server
ssh_key_name:
type: string
description: name of ssh key to be provisioned on our server
default: lars
external_network:
type: string
@ -29,20 +27,19 @@ parameters:
type: string
description: >
whether or not kubernetes should permit privileged containers.
default: "false"
constraints:
- allowed_values: ["true", "false"]
# The following are all generated in the parent template.
kube_master_ip:
type: string
description: IP address of the Kubernetes master server.
fixed_network:
type: string
description: Network from which to allocate fixed addresses.
wait_condition_timeout:
type: number
default: 6000
description : >
timeout for the Wait Conditions

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

@ -13,13 +13,11 @@ parameters:
minion_flavor:
type: string
default: m1.small
description: flavor to use when booting the server
ssh_key_name:
type: string
description: name of ssh key to be provisioned on our server
default: lars
external_network:
type: string
@ -29,7 +27,6 @@ parameters:
type: string
description: >
whether or not kubernetes should permit privileged containers.
default: "false"
constraints:
- allowed_values: ["true", "false"]
@ -38,19 +35,16 @@ parameters:
description: >
size of a cinder volume to allocate to docker for container/image
storage
default: 25
tls_disabled:
type: boolean
description: whether or not to enable TLS
default: False
kubernetes_port:
type: number
description: >
The port which are used by kube-apiserver to provide Kubernetes
service.
default: 6443
bay_uuid:
type: string
@ -60,26 +54,30 @@ parameters:
type: string
description: endpoint to retrieve TLS certs from
# The following are all generated in the parent template.
kube_master_ip:
type: string
description: IP address of the Kubernetes master server.
etcd_server_ip:
type: string
description: IP address of the Etcd server.
fixed_network:
type: string
description: Network from which to allocate fixed addresses.
fixed_subnet:
type: string
description: Subnet from which to allocate fixed addresses.
network_driver:
type: string
description: network driver to use for instantiating container networks
flannel_network_cidr:
type: string
description: network range for flannel overlay network
wait_condition_timeout:
type: number
description : >
@ -89,62 +87,51 @@ parameters:
type: boolean
description: >
Indicates whether the docker registry is enabled.
default: false
registry_port:
type: number
description: port of registry service
default: 5000
registry_username:
type: string
description: username used by docker registry
default: "username"
registry_password:
type: string
description: password used by docker registry
default: "password"
hidden: true
registry_domain:
type: string
description: domain used by docker registry
default: "domain"
registry_trust_id:
type: string
description: trust_id used by docker registry
default: "trust_id"
hidden: true
registry_auth_url:
type: string
description: auth_url for keystone
default: "auth_url"
registry_region:
type: string
description: region of swift service
default: "region"
registry_container:
type: string
description: >
name of swift container which docker registry stores images in
default: "container"
registry_insecure:
type: boolean
description: >
indicates whether to skip TLS verification between registry and backend storage
default: true
registry_chunksize:
type: number
description: >
size fo the data segments for the swift dynamic large objects
default: 5242880
secgroup_kube_minion_id:
type: string
@ -183,17 +170,14 @@ parameters:
http_proxy:
type: string
description: http proxy address for docker
default: ""
https_proxy:
type: string
description: https proxy address for docker
default: ""
no_proxy:
type: string
description: no proxies for docker
default: ""
kube_version:
type: string
@ -202,18 +186,15 @@ parameters:
trustee_user_id:
type: string
description: user id of the trustee
default: ""
trustee_password:
type: string
description: password of the trustee
default: ""
hidden: true
trust_id:
type: string
description: id of the trust which is used by the trustee
default: ""
hidden: true
auth_url:

6
magnum/templates/mesos/mesosmaster.yaml
View File

@ -13,7 +13,6 @@ parameters:
master_flavor:
type: string
default: m1.small
description: flavor to use when booting the server
ssh_key_name:
@ -24,19 +23,22 @@ parameters:
type: string
description: uuid/name of a network to use for floating ip addresses
# The following are all generated in the parent template.
fixed_network:
type: string
description: Network from which to allocate fixed addresses.
fixed_subnet:
type: string
description: Subnet from which to allocate fixed addresses.
secgroup_base_id:
type: string
description: ID of the security group for base.
secgroup_mesos_id:
type: string
description: ID of the security group for mesos master.
api_pool_id:
type: string
description: ID of the load balancer pool of Marathon.

16
magnum/templates/mesos/mesosslave.yaml
View File

@ -9,12 +9,10 @@ parameters:
server_image:
type: string
default: ubuntu-mesos
description: glance image used to boot the server
slave_flavor:
type: string
default: m1.small
description: flavor to use when booting the server
ssh_key_name:
@ -23,12 +21,10 @@ parameters:
external_network:
type: string
default: public
description: uuid/name of a network to use for floating ip addresses
wait_condition_timeout:
type: number
default: 6000
description : >
timeout for the Wait Conditions
@ -37,22 +33,18 @@ parameters:
description: >
Amount of time to wait for an executor to register with the slave before
considering it hung and shutting it down
default: 5mins
http_proxy:
type: string
description: http proxy address for docker
default: ""
https_proxy:
type: string
description: https proxy address for docker
default: ""
no_proxy:
type: string
description: no proxies for docker
default: ""
auth_url:
type: string
@ -68,8 +60,6 @@ parameters:
description: >
user password, not set in current implementation, only used to
fill in for Kubernetes config file
default:
password
hidden: true
tenant_name:
@ -80,7 +70,6 @@ parameters:
volume_driver:
type: string
description: volume driver to use for container storage
default: ""
region_name:
type: string
@ -97,18 +86,19 @@ parameters:
description: >
enables any host to take control of a volume irrespective of whether
other hosts are using the volume
default: "false"
# The following are all generated in the parent template.
mesos_masters_ips:
type: string
description: IP addresses of the Mesos master servers.
fixed_network:
type: string
description: Network from which to allocate fixed addresses.
fixed_subnet:
type: string
description: Subnet from which to allocate fixed addresses.
secgroup_base_id:
type: string
description: ID of the security group for base.

3
magnum/templates/swarm/swarmmaster.yaml
View File

@ -119,18 +119,15 @@ parameters:
trustee_user_id:
type: string
description: user id of the trustee
default: ""
trustee_password:
type: string
description: password of the trustee
default: ""
hidden: true
trust_id:
type: string
description: id of the trust which is used by the trustee
default: ""
hidden: true
auth_url: