Merge pull request #7549 from tzumainn/heat-template-version

Add openshift_openstack_heat_template_version option

playbooks/openstack/configuration.md

@@ -87,6 +87,7 @@ openshift_openstack_cluster_node_labels:
   * `openshift_openstack_docker_lb_volume_size`
 * `openshift_openstack_flat_secgrp` Set to True if you experience issues with sec group rules quotas. It trades security for number of rules, by sharing the same set of firewall rules for master, node, etcd and infra nodes.
 * `openshift_openstack_required_packages` List of additional prerequisite packages to be installed before deploying an OpenShift cluster.
+* `openshift_openstack_heat_template_version` Defaults to `pike`
 
 
 ## OpenShift Configuration

roles/openshift_openstack/defaults/main.yml

@@ -55,6 +55,7 @@ openshift_openstack_app_subdomain: "apps"
 
 
 # heat vars
+openshift_openstack_heat_template_version: pike
 openshift_openstack_clusterid: openshift
 openshift_openstack_stack_name: "openshift-cluster"
 openshift_openstack_subnet_cidr: "192.168.99.0/24"

roles/openshift_openstack/templates/heat_stack.yaml.j2

@@ -1,4 +1,4 @@
-heat_template_version: 2016-10-14
+heat_template_version: {{ openshift_openstack_heat_template_version }}
 
 description: OpenShift cluster
 

roles/openshift_openstack/templates/heat_stack_segmentation_ids.yaml.j2

@@ -1,4 +1,4 @@
-heat_template_version: pike
+heat_template_version: {{ openshift_openstack_heat_template_version }}
 
 description: Simple template to generate the needed vlan ids
 

roles/openshift_openstack/templates/heat_stack_server.yaml.j2

@@ -1,4 +1,4 @@
-heat_template_version: pike
+heat_template_version: {{ openshift_openstack_heat_template_version }}
 
 description: OpenShift cluster server
 

roles/openshift_openstack/templates/heat_stack_subports.yaml.j2

@@ -1,4 +1,4 @@
-heat_template_version: pike
+heat_template_version: {{ openshift_openstack_heat_template_version }}
 
 description: Template to create subports