diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-07-15 15:22:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-07-15 15:22:03 +0000 |
| commit | 1ce0f9db531a40e0c3915906a24c002d8ed3eae6 (patch) | |
| tree | 983b4b768de38d3fa6bbe9c028e8d489952184fe /controller.yaml | |
| parent | 1a1ae9444e275471709aafd2160275411261da83 (diff) | |
| parent | be0d3f3520037c4e2e9fb4f9a235171aaad7e253 (diff) | |
Merge "Adds the NeutronTunnelIdRanges and NeutronVniRanges parameters"
Diffstat (limited to 'controller.yaml')
| -rw-r--r-- | controller.yaml | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/controller.yaml b/controller.yaml index 9dd41c99..5983a41e 100644 --- a/controller.yaml +++ b/controller.yaml @@ -364,6 +364,18 @@ parameters: The tunnel types for the Neutron tenant network. To specify multiple values, use a comma separated string, like so: 'gre,vxlan' type: string + NeutronTunnelIdRanges: + description: | + Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges + of GRE tunnel IDs that are available for tenant network allocation + default: ["1:1000", ] + type: comma_delimited_list + NeutronVniRanges: + description: | + Comma-separated list of <vni_min>:<vni_max> tuples enumerating ranges + of VXLAN VNI IDs that are available for tenant network allocation + default: ["1:1000", ] + type: comma_delimited_list NovaPassword: default: unset description: The password for the nova service and db account, used by nova-api. @@ -661,6 +673,8 @@ resources: physical_bridge: br-ex tenant_network_type: {get_input: neutron_tenant_network_type} tunnel_types: {get_input: neutron_tunnel_types} + tunnel_id_ranges: {get_input: neutron_tunnel_id_ranges} + vni_ranges: {get_input: neutron_vni_ranges} ovs_db: {get_input: neutron_dsn} service-password: {get_input: neutron_password} dnsmasq-options: {get_input: neutron_dnsmasq_options} @@ -902,6 +916,22 @@ resources: neutron_public_interface_tag: {get_param: NeutronPublicInterfaceTag} neutron_tenant_network_type: {get_param: NeutronNetworkType} neutron_tunnel_types: {get_param: NeutronTunnelTypes} + neutron_tunnel_id_ranges: + str_replace: + template: "['RANGES']" + params: + RANGES: + list_join: + - "','" + - {get_param: NeutronTunnelIdRanges} + neutron_vni_ranges: + str_replace: + template: "['RANGES']" + params: + RANGES: + list_join: + - "','" + - {get_param: NeutronVniRanges} neutron_password: {get_param: NeutronPassword} neutron_dnsmasq_options: {get_param: NeutronDnsmasqOptions} neutron_dsn: |