summaryrefslogtreecommitdiffstats
path: root/roles/openstack-stack
diff options
context:
space:
mode:
authorBogdan Dobrelya <bdobreli@redhat.com>2017-08-25 09:25:20 +0200
committerTomas Sedovic <tomas@sedovic.cz>2017-08-25 09:25:20 +0200
commitce3be1e039fd3bddf245bdaed83466f12b59937b (patch)
tree1af454bed012e0b89a24e28b16267b770178aebd /roles/openstack-stack
parent5e992e7aa7da17ffb741082c2d7568259ebd3d5b (diff)
downloadopenshift-ce3be1e039fd3bddf245bdaed83466f12b59937b.tar.gz
openshift-ce3be1e039fd3bddf245bdaed83466f12b59937b.tar.bz2
openshift-ce3be1e039fd3bddf245bdaed83466f12b59937b.tar.xz
openshift-ce3be1e039fd3bddf245bdaed83466f12b59937b.zip
Cast num_* as int for jinja templates (#685)
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
Diffstat (limited to 'roles/openstack-stack')
-rw-r--r--roles/openstack-stack/templates/heat_stack.yaml.j28
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openstack-stack/templates/heat_stack.yaml.j2 b/roles/openstack-stack/templates/heat_stack.yaml.j2
index c0da4c184..1ecf84aa6 100644
--- a/roles/openstack-stack/templates/heat_stack.yaml.j2
+++ b/roles/openstack-stack/templates/heat_stack.yaml.j2
@@ -439,7 +439,7 @@ resources:
port_range_min: 53
port_range_max: 53
remote_ip_prefix: "{{ openstack_subnet_prefix }}.0/24"
-{% if num_masters > 1 or ui_ssh_tunnel|bool %}
+{% if num_masters|int > 1 or ui_ssh_tunnel|bool %}
lb-secgrp:
type: OS::Neutron::SecurityGroup
properties:
@@ -513,7 +513,7 @@ resources:
depends_on:
- interface
-{% if num_masters > 1 %}
+{% if num_masters|int > 1 %}
loadbalancer:
type: OS::Heat::ResourceGroup
properties:
@@ -592,7 +592,7 @@ resources:
{% else %}
- { get_resource: master-secgrp }
- { get_resource: node-secgrp }
-{% if num_etcd == 0 %}
+{% if num_etcd|int == 0 %}
- { get_resource: etcd-secgrp }
{% endif %}
{% endif %}
@@ -701,7 +701,7 @@ resources:
{% else %}
- { get_resource: node-secgrp }
{% endif %}
-{% if ui_ssh_tunnel|bool and num_masters < 2 %}
+{% if ui_ssh_tunnel|bool and num_masters|int < 2 %}
- { get_resource: lb-secgrp }
{% endif %}
- { get_resource: infra-secgrp }