diff options
| author |   Sven Anderson <sven@redhat.com> | 2017-04-13 18:29:50 +0200 |
|---|---|---|
| committer | Sven Anderson <sven@redhat.com> | 2017-05-02 14:13:08 +0200 |
| commit | 773505222f2022e829d3aa3dbb8200af0ac952e3 (patch) | |
| tree | 2f3d5ea5c621853ea95145141135cb61eba3a0c1 /puppet | |
| parent | 8391468d16d9c16a91c7b569789402fdcbda6753 (diff) | |
Add parameter Ec2ApiExternalNetwork for VPCs
Change-Id: I26652afe0f513ec354c05570e7fa0e5b4b0ab669
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/ec2-api.yaml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/puppet/services/ec2-api.yaml b/puppet/services/ec2-api.yaml index d1adefe5..98d656a5 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 @@ -52,6 +61,7 @@ parameters: conditions: nova_workers_zero: {equals : [{get_param: Ec2ApiWorkers}, 0]} + external_network_unset: {equals : [{get_param: Ec2ApiExternalNetwork}, '']} outputs: role_data: @@ -109,6 +119,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: |