diff options
| author | Bogdan Dobrelya <bdobreli@redhat.com> | 2017-06-27 18:38:22 +0200 |
|---|---|---|
| committer | Bogdan Dobrelya <bdobreli@redhat.com> | 2017-06-28 10:50:20 +0200 |
| commit | 2d6b572891e5f9c5f8950f86ae741b386b3d8289 (patch) | |
| tree | 40f919ee11bb75aa4ce04f983c0edf4e42def919 | |
| parent | aa0117e33474cbfa0e7206fe181a63508364a67b (diff) | |
| download | openshift-2d6b572891e5f9c5f8950f86ae741b386b3d8289.tar.gz openshift-2d6b572891e5f9c5f8950f86ae741b386b3d8289.tar.bz2 openshift-2d6b572891e5f9c5f8950f86ae741b386b3d8289.tar.xz openshift-2d6b572891e5f9c5f8950f86ae741b386b3d8289.zip | |
Put back node/flat secgrp for infra nodes on openstack
Partially undo 2028883e936c8a1a0be031a19d531d0804a32b68
to unblock end-to-end deployments
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
| -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 cba03e2ca..2d957cc5b 100644 --- a/roles/openstack-stack/templates/heat_stack.yaml.j2 +++ b/roles/openstack-stack/templates/heat_stack.yaml.j2 @@ -674,6 +674,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 }} |