Merge "[k8s-atomic] Support master_lb_allowed_cidrs in template"
This commit is contained in:
commit
5b8edcfe17
|
@ -1537,8 +1537,8 @@ _`master_lb_floating_ip_enabled`
|
|||
_`master_lb_allowed_cidrs`
|
||||
A CIDR list which can be used to control the access for the load balancer of
|
||||
master nodes. The input format is comma delimited list. For example,
|
||||
192.168.0.0/16,10.0.0.0/24. Default value is "" which means opening to
|
||||
0.0.0.0/0.
|
||||
192.168.0.0/16,10.0.0.0/24.
|
||||
Default: "" (which opens to 0.0.0.0/0)
|
||||
|
||||
_`auto_healing_enabled`
|
||||
If set to true, auto healing feature will be enabled. Defaults to false.
|
||||
|
|
|
@ -920,6 +920,11 @@ parameters:
|
|||
specific configs
|
||||
default: ""
|
||||
|
||||
master_lb_allowed_cidrs:
|
||||
type: comma_delimited_list
|
||||
description: The allowed CIDR list for master load balancer
|
||||
default: []
|
||||
|
||||
resources:
|
||||
|
||||
######################################################################
|
||||
|
@ -949,6 +954,7 @@ resources:
|
|||
external_network: {get_param: external_network}
|
||||
protocol: {get_param: loadbalancing_protocol}
|
||||
port: {get_param: kubernetes_port}
|
||||
allowed_cidrs: {get_param: master_lb_allowed_cidrs}
|
||||
|
||||
etcd_lb:
|
||||
condition: create_cluster_resources
|
||||
|
@ -957,6 +963,7 @@ resources:
|
|||
fixed_subnet: {get_attr: [network, fixed_subnet]}
|
||||
protocol: {get_param: loadbalancing_protocol}
|
||||
port: 2379
|
||||
allowed_cidrs: {get_param: master_lb_allowed_cidrs}
|
||||
|
||||
######################################################################
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue