aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Anderson <sven@redhat.com>2017-04-13 18:29:50 +0200
committerSven Anderson <sven@redhat.com>2017-06-19 15:38:25 +0200
commit80e5f5009af2e3efe30de74a426fd576e02ca580 (patch)
tree89049c39e02f559718ef484fdfb8861fa07f1bd3
parent106c25b6aaaee80451ca6eabcb0be51adb81815e (diff)
Add parameter Ec2ApiExternalNetwork for VPCs
Change-Id: I26652afe0f513ec354c05570e7fa0e5b4b0ab669 Related-Bug: #1676491 (cherry picked from commit 773505222f2022e829d3aa3dbb8200af0ac952e3)
-rw-r--r--puppet/services/ec2-api.yaml15
1 files changed, 15 insertions, 0 deletions
diff --git a/puppet/services/ec2-api.yaml b/puppet/services/ec2-api.yaml
index f6cf13f..427f87f 100644
--- a/puppet/services/ec2-api.yaml
+++ b/puppet/services/ec2-api.yaml
@@ -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: