Merge pull request #10172 from tzumainn/openstack-subnet-no-router

Only create OpenStack router if both router and subnet are undefined

roles/openshift_openstack/templates/heat_stack.yaml.j2

@@ -391,7 +391,7 @@ resources:
       gateway_ip: null
 {% endif %}
 
-{% if not openshift_openstack_router_name %}
+{% if not openshift_openstack_router_name and not openshift_openstack_node_subnet_name %}
   router:
     type: OS::Neutron::Router
     properties: