Add parameter Ec2ApiExternalNetwork for VPCs

Change-Id: I26652afe0f513ec354c05570e7fa0e5b4b0ab669
Related-Bug: #1676491
(cherry picked from commit 773505222f)
This commit is contained in:
Sven Anderson 2017-04-13 18:29:50 +02:00
parent 106c25b6aa
commit 80e5f5009a
1 changed files with 15 additions and 0 deletions

View File

@ -30,6 +30,15 @@ parameters:
type: string
default: 'regionOne'
description: Keystone region for endpoint
Ec2ApiExternalNetwork:
type: string
default: ''
description: Name of the external network, which is used to connect VPCs to
Internet and to allocate Elastic IPs
NovaDefaultFloatingPool:
default: 'public'
description: Default pool for floating IP addresses
type: string
MonitoringSubscriptionEc2Api:
default: 'overcloud-ec2-api'
type: string
@ -46,6 +55,7 @@ parameters:
conditions:
nova_workers_zero: {equals : [{get_param: Ec2ApiWorkers}, 0]}
external_network_unset: {equals : [{get_param: Ec2ApiExternalNetwork}, '']}
outputs:
role_data:
@ -102,6 +112,11 @@ outputs:
- {}
- ec2api::api::ec2api_workers: {get_param: Ec2ApiWorkers}
ec2api::metadata::metadata_workers: {get_param: Ec2ApiWorkers}
-
if:
- external_network_unset
- ec2api::api::external_network: {get_param: NovaDefaultFloatingPool}
- ec2api::api::external_network: {get_param: Ec2ApiExternalNetwork}
step_config: |
include tripleo::profile::base::nova::ec2api
service_config_settings: