瀏覽代碼

Merge pull request #10081 from iamemilio/cns_secgrp

Cns secgrp
OpenShift Merge Robot 6 年之前
父節點
當前提交
541e29bbff
共有 1 個文件被更改,包括 4 次插入1 次删除
  1. 4 1
      roles/openshift_openstack/templates/heat_stack.yaml.j2

+ 4 - 1
roles/openshift_openstack/templates/heat_stack.yaml.j2

@@ -580,7 +580,7 @@ resources:
           params:
             cluster_id: {{ openshift_openstack_full_dns_domain }}
       rules: {{ openshift_openstack_infra_secgroup_rules|to_json }}
-
+  {% if openshift_openstack_num_cns > 0 %}
   cns-secgrp:
     type: OS::Neutron::SecurityGroup
     properties:
@@ -595,6 +595,7 @@ resources:
           params:
             cluster_id: {{ openshift_openstack_full_dns_domain }}
       rules: {{ openshift_openstack_cns_secgroup_rules|to_json }}
+  {% endif %}
 {% endif %}
 
   lb-secgrp:
@@ -1093,7 +1094,9 @@ resources:
             - { get_resource: flat-secgrp }
 {% else %}
             - { get_resource: node-secgrp }
+{% if openshift_openstack_num_cns > 0 %}
             - { get_resource: cns-secgrp }
+{% endif %}
 {% if openshift_use_kuryr|default(false)|bool %}
           pod_secgrp:
             - { get_resource: pod_access_sg }