diff options
| author | Tomas Sedovic <tomas@sedovic.cz> | 2017-06-28 13:35:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-28 13:35:31 +0200 |
| commit | 9bd4a73fd52ef1d4774379cbf6e67cdcb334c9f0 (patch) | |
| tree | 7d141dc5c5ae09ed310826e153becd64029eedfb /roles/openstack-stack/templates | |
| parent | dc659cd333fe128373f1755e1cb17450a52d44f5 (diff) | |
| parent | 2d6b572891e5f9c5f8950f86ae741b386b3d8289 (diff) | |
| download | openshift-9bd4a73fd52ef1d4774379cbf6e67cdcb334c9f0.tar.gz openshift-9bd4a73fd52ef1d4774379cbf6e67cdcb334c9f0.tar.bz2 openshift-9bd4a73fd52ef1d4774379cbf6e67cdcb334c9f0.tar.xz openshift-9bd4a73fd52ef1d4774379cbf6e67cdcb334c9f0.zip | |
Merge pull request #512 from bogdando/undo_infra_secgrp
Put back node/flat secgrp for infra nodes on openstack
Diffstat (limited to 'roles/openstack-stack/templates')
| -rw-r--r-- | roles/openstack-stack/templates/heat_stack.yaml.j2 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/openstack-stack/templates/heat_stack.yaml.j2 b/roles/openstack-stack/templates/heat_stack.yaml.j2 index 7fa7133ea..02bc3b49b 100644 --- a/roles/openstack-stack/templates/heat_stack.yaml.j2 +++ b/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 }} |