Combine master security groups in k8s driver
This patch combines the two security groups that the Kubernetes Fedora Atomic driver creates for the master nodes. Change-Id: I37167f1ccd9ce04c225b906bf682d2c2165f281b Closes-bug: #1641735
This commit is contained in:
parent
62046a7f81
commit
60ebfb02a7
|
@ -304,7 +304,7 @@ resources:
|
|||
# sorts.
|
||||
#
|
||||
|
||||
secgroup_base:
|
||||
secgroup_kube_master:
|
||||
type: OS::Neutron::SecurityGroup
|
||||
properties:
|
||||
rules:
|
||||
|
@ -312,11 +312,6 @@ resources:
|
|||
- protocol: tcp
|
||||
port_range_min: 22
|
||||
port_range_max: 22
|
||||
|
||||
secgroup_kube_master:
|
||||
type: OS::Neutron::SecurityGroup
|
||||
properties:
|
||||
rules:
|
||||
- protocol: tcp
|
||||
port_range_min: 7080
|
||||
port_range_max: 7080
|
||||
|
@ -486,7 +481,6 @@ resources:
|
|||
tenant_name: {get_param: tenant_name}
|
||||
kubernetes_port: {get_param: kubernetes_port}
|
||||
tls_disabled: {get_param: tls_disabled}
|
||||
secgroup_base_id: {get_resource: secgroup_base}
|
||||
secgroup_kube_master_id: {get_resource: secgroup_kube_master}
|
||||
http_proxy: {get_param: http_proxy}
|
||||
https_proxy: {get_param: https_proxy}
|
||||
|
|
|
@ -113,10 +113,6 @@ parameters:
|
|||
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.
|
||||
|
@ -406,7 +402,6 @@ resources:
|
|||
properties:
|
||||
network: {get_param: fixed_network}
|
||||
security_groups:
|
||||
- {get_param: secgroup_base_id}
|
||||
- {get_param: secgroup_kube_master_id}
|
||||
fixed_ips:
|
||||
- subnet: {get_param: fixed_subnet}
|
||||
|
|
Loading…
Reference in New Issue