Merge "Combine master security groups in k8s driver"

magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml

@@ -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}

magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml

@@ -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}