Merge pull request #512 from bogdando/undo_infra_secgrp

Put back node/flat secgrp for infra nodes on openstack

roles/openstack-stack/templates/heat_stack.yaml.j2

@@ -676,6 +676,12 @@ resources:
           net:         { get_resource: net }
           subnet:      { get_resource: subnet }
           secgrp:
+# TODO(bogdando) filter only required node rules into infra-secgrp
+{% if openstack_flat_secgrp|bool %}
+            - { get_resource: flat-secgrp }
+{% else %}
+            - { get_resource: node-secgrp }
+{% endif %}
             - { get_resource: infra-secgrp }
             - { get_resource: common-secgrp }
           floating_network: {{ external_network }}