Fixing compatible issues between repos (#886)

openshift · Jan 2, 2018 · c87a00a · c87a00a
1 parent 29eeb68
commit c87a00a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/roles/openstack-stack/templates/heat_stack.yaml.j2 b/roles/openstack-stack/templates/heat_stack.yaml.j2
@@ -562,14 +562,14 @@ resources:
       - interface
 {% endif %}
 
-{% if master_server_group_policies|length > 0 %}
+{% if master_server_group_policies is defined and master_server_group_policies|length > 0 %}
   master_server_group:
     type: OS::Nova::ServerGroup
     properties:
       name: master_server_group
       policies: {{ master_server_group_policies }}
 {% endif %}
-{% if infra_server_group_policies|length > 0 %}
+{% if infra_server_group_policies is defined and infra_server_group_policies|length > 0 %}
   infra_server_group:
     type: OS::Nova::ServerGroup
     properties:
@@ -689,7 +689,7 @@ resources:
           attach_float_net: false
 {% endif %}
           volume_size: {{ master_volume_size }}
-{% if master_server_group_policies|length > 0 %}
+{% if master_server_group_policies is defined and master_server_group_policies|length > 0 %}
           scheduler_hints:
             group: { get_resource: master_server_group }
 {% endif %}
@@ -827,7 +827,7 @@ resources:
           floating_network: {{ external_network }}
 {% endif %}
           volume_size: {{ infra_volume_size }}
-{% if infra_server_group_policies|length > 0 %}
+{% if infra_server_group_policies is defined and infra_server_group_policies|length > 0 %}
           scheduler_hints:
             group: { get_resource: infra_server_group }
 {% endif %}