summaryrefslogtreecommitdiffstats
path: root/playbooks/openstack/openshift-cluster/files
diff options
context:
space:
mode:
authorLénaïc Huard <lhuard@amadeus.com>2015-08-17 10:43:49 +0200
committerLénaïc Huard <lhuard@amadeus.com>2015-08-17 10:44:24 +0200
commitb9606a11fe875d9151a0238bc45f149e1cbe819c (patch)
tree98eaf8f37d3e4d9613bfc2f9ee90e18291bb3cb0 /playbooks/openstack/openshift-cluster/files
parent30d653aa5b776afbf35c98b1b5e7436f8cb7123c (diff)
downloadopenshift-b9606a11fe875d9151a0238bc45f149e1cbe819c.tar.gz
openshift-b9606a11fe875d9151a0238bc45f149e1cbe819c.tar.bz2
openshift-b9606a11fe875d9151a0238bc45f149e1cbe819c.tar.xz
openshift-b9606a11fe875d9151a0238bc45f149e1cbe819c.zip
Properly pass the "external network" option to the HEAT template
Fixes #471
Diffstat (limited to 'playbooks/openstack/openshift-cluster/files')
-rw-r--r--playbooks/openstack/openshift-cluster/files/heat_stack.yaml42
1 files changed, 24 insertions, 18 deletions
diff --git a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
index d53884e0d..40e4ab22c 100644
--- a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
+++ b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
@@ -9,21 +9,6 @@ parameters:
label: Cluster ID
description: Identifier of the cluster
- num_masters:
- type: number
- label: Number of masters
- description: Number of masters
-
- num_nodes:
- type: number
- label: Number of compute nodes
- description: Number of compute nodes
-
- num_infra:
- type: number
- label: Number of infrastructure nodes
- description: Number of infrastructure nodes
-
cidr:
type: string
label: CIDR
@@ -40,6 +25,12 @@ parameters:
description: Name of the external network
default: external
+ floating_ip_pool:
+ type: string
+ label: Floating IP pool
+ description: Floating IP pools
+ default: external
+
ssh_public_key:
type: string
label: SSH public key
@@ -52,6 +43,21 @@ parameters:
description: Source of legitimate ssh connections
default: 0.0.0.0/0
+ num_masters:
+ type: number
+ label: Number of masters
+ description: Number of masters
+
+ num_nodes:
+ type: number
+ label: Number of compute nodes
+ description: Number of compute nodes
+
+ num_infra:
+ type: number
+ label: Number of infrastructure nodes
+ description: Number of infrastructure nodes
+
master_image:
type: string
label: Master image
@@ -290,7 +296,7 @@ resources:
subnet: { get_resource: subnet }
secgrp:
- { get_resource: master-secgrp }
- floating_network: { get_param: external_net }
+ floating_network: { get_param: floating_ip_pool }
net_name:
str_replace:
template: openshift-ansible-cluster_id-net
@@ -322,7 +328,7 @@ resources:
subnet: { get_resource: subnet }
secgrp:
- { get_resource: node-secgrp }
- floating_network: { get_param: external_net }
+ floating_network: { get_param: floating_ip_pool }
net_name:
str_replace:
template: openshift-ansible-cluster_id-net
@@ -355,7 +361,7 @@ resources:
secgrp:
- { get_resource: node-secgrp }
- { get_resource: infra-secgrp }
- floating_network: { get_param: external_net }
+ floating_network: { get_param: floating_ip_pool }
net_name:
str_replace:
template: openshift-ansible-cluster_id-net