summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Sedovic <tomas@sedovic.cz>2017-07-13 13:13:40 +0000
committerTomas Sedovic <tomas@sedovic.cz>2017-07-13 13:17:02 +0000
commitbb483b5877a18422d382f2348ad53d4de07a5fd7 (patch)
treeb75f7773559288bba62c374fb0a171fb7f204be8
parentfb904c43a43f67d0e373e5661fe7599703e11b22 (diff)
downloadopenshift-bb483b5877a18422d382f2348ad53d4de07a5fd7.tar.gz
openshift-bb483b5877a18422d382f2348ad53d4de07a5fd7.tar.bz2
openshift-bb483b5877a18422d382f2348ad53d4de07a5fd7.tar.xz
openshift-bb483b5877a18422d382f2348ad53d4de07a5fd7.zip
Replace greaterthan and equalto in openstack-stack
These two Jinja filters were added in 2.8 which is notably not packaged in CentOS and RHEL. This removes them in favour of the `==` and `>` operators which are available in Jinja 2.7.
-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 566b57ef8..992f6257b 100644
--- a/roles/openstack-stack/templates/heat_stack.yaml.j2
+++ b/roles/openstack-stack/templates/heat_stack.yaml.j2
@@ -432,7 +432,7 @@ resources:
port_range_min: 53
port_range_max: 53
remote_ip_prefix: "{{ openstack_subnet_prefix }}.0/24"
-{% if num_masters is greaterthan 1 %}
+{% if num_masters > 1 %}
lb-secgrp:
type: OS::Neutron::SecurityGroup
properties:
@@ -444,7 +444,7 @@ resources:
port_range_min: {{ openshift_master_api_port | default(8443) }}
port_range_max: {{ openshift_master_api_port | default(8443) }}
remote_ip_prefix: {{ lb_ingress_cidr }}
- {% if openshift_master_console_port is defined and openshift_master_console_port is not equalto openshift_master_api_port %}
+ {% if openshift_master_console_port is defined and openshift_master_console_port != openshift_master_api_port %}
- direction: ingress
protocol: tcp
port_range_min: {{ openshift_master_console_port | default(8443) }}
@@ -493,7 +493,7 @@ resources:
depends_on:
- interface
-{% if num_masters is greaterthan 1 %}
+{% if num_masters > 1 %}
loadbalancer:
type: OS::Heat::ResourceGroup
properties:
@@ -568,7 +568,7 @@ resources:
{% else %}
- { get_resource: master-secgrp }
- { get_resource: node-secgrp }
-{% if num_etcd is equalto 0 %}
+{% if num_etcd == 0 %}
- { get_resource: etcd-secgrp }
{% endif %}
{% endif %}