diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-03 20:08:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-03 20:08:46 +0000 |
| commit | 9291a7941655a68bdcb40af863def076a6f7108a (patch) | |
| tree | 72b8706ac83522414f0a4a98663eb4fcb5d71725 | |
| parent | 6b80b35736378002df05c13bd78ddc12e35ab209 (diff) | |
| parent | 773505222f2022e829d3aa3dbb8200af0ac952e3 (diff) | |
Merge "Add parameter Ec2ApiExternalNetwork for VPCs"
| -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: |