summaryrefslogtreecommitdiff
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
Notes
Notes (review): Code-Review+2: Steven Hardy <shardy@redhat.com> Code-Review+2: Emilien Macchi <emilien@redhat.com> Workflow+1: Emilien Macchi <emilien@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 19 Jun 2017 21:22:22 +0000 Reviewed-on: https://review.openstack.org/462542 Project: openstack/tripleo-heat-templates Branch: refs/heads/stable/ocata
-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:
30 type: string 30 type: string
31 default: 'regionOne' 31 default: 'regionOne'
32 description: Keystone region for endpoint 32 description: Keystone region for endpoint
33 Ec2ApiExternalNetwork:
34 type: string
35 default: ''
36 description: Name of the external network, which is used to connect VPCs to
37 Internet and to allocate Elastic IPs
38 NovaDefaultFloatingPool:
39 default: 'public'
40 description: Default pool for floating IP addresses
41 type: string
33 MonitoringSubscriptionEc2Api: 42 MonitoringSubscriptionEc2Api:
34 default: 'overcloud-ec2-api' 43 default: 'overcloud-ec2-api'
35 type: string 44 type: string
@@ -46,6 +55,7 @@ parameters:
46 55
47conditions: 56conditions:
48 nova_workers_zero: {equals : [{get_param: Ec2ApiWorkers}, 0]} 57 nova_workers_zero: {equals : [{get_param: Ec2ApiWorkers}, 0]}
58 external_network_unset: {equals : [{get_param: Ec2ApiExternalNetwork}, '']}
49 59
50outputs: 60outputs:
51 role_data: 61 role_data:
@@ -102,6 +112,11 @@ outputs:
102 - {} 112 - {}
103 - ec2api::api::ec2api_workers: {get_param: Ec2ApiWorkers} 113 - ec2api::api::ec2api_workers: {get_param: Ec2ApiWorkers}
104 ec2api::metadata::metadata_workers: {get_param: Ec2ApiWorkers} 114 ec2api::metadata::metadata_workers: {get_param: Ec2ApiWorkers}
115 -
116 if:
117 - external_network_unset
118 - ec2api::api::external_network: {get_param: NovaDefaultFloatingPool}
119 - ec2api::api::external_network: {get_param: Ec2ApiExternalNetwork}
105 step_config: | 120 step_config: |
106 include tripleo::profile::base::nova::ec2api 121 include tripleo::profile::base::nova::ec2api
107 service_config_settings: 122 service_config_settings: