diff options
| author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-08-26 11:55:10 -0400 |
|---|---|---|
| committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-08-26 11:55:10 -0400 |
| commit | 16ee4457862a79f77b43997a646b4e27391c34fb (patch) | |
| tree | ee27d4399c156c90d065b7fd05b2d4615024f632 /playbooks/openstack/openshift-cluster/files | |
| parent | fa3411adb3458cf225ab60314c6e8c99678d0da1 (diff) | |
| parent | b9606a11fe875d9151a0238bc45f149e1cbe819c (diff) | |
| download | openshift-16ee4457862a79f77b43997a646b4e27391c34fb.tar.gz openshift-16ee4457862a79f77b43997a646b4e27391c34fb.tar.bz2 openshift-16ee4457862a79f77b43997a646b4e27391c34fb.tar.xz openshift-16ee4457862a79f77b43997a646b4e27391c34fb.zip | |
Merge pull request #483 from lhuard1A/issue_471
Properly pass the "external network" option to the HEAT template
Diffstat (limited to 'playbooks/openstack/openshift-cluster/files')
| -rw-r--r-- | playbooks/openstack/openshift-cluster/files/heat_stack.yaml | 42 |
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 |