diff options
| author |   marios <marios@redhat.com> | 2015-07-08 13:29:59 +0300 |
|---|---|---|
| committer | marios <marios@redhat.com> | 2015-07-13 15:32:28 +0300 |
| commit | be0d3f3520037c4e2e9fb4f9a235171aaad7e253 (patch) | |
| tree | ecd751f78dce5a98a9b919ede58bfa7dca32a499 /puppet/hieradata | |
| parent | b7400f95a4c185c6c1b3294c11af828d799939d0 (diff) | |
Adds the NeutronTunnelIdRanges and NeutronVniRanges parameters
This adds the NeutronTunnelIdRanges and NeutronVniRanges parameters
which govern the GRE or VXLAN tunnel IDs (respectively) that are to
be made available for overcloud tenant networks.
These both default to "1:1000," to retain the current behaviour.
They are propagated to the hiera data for puppet deploys and there
is a separate change to support passing these into the config via
the neutron tripleo-image-element at
https://review.openstack.org/#/c/199592/
Change-Id: I967a8cae218a31e888abc438e9de5756ae627adb
Related-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1240631
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/common.yaml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index 40c44aef..7a035435 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -13,10 +13,6 @@ nova::network::neutron::vif_plugging_is_fatal: false nova::network::neutron::vif_plugging_timeout: 30 nova::network::neutron::dhcp_domain: '' -neutron::plugins::ml2::tunnel_id_ranges: - - '1:1000' -neutron::plugins::ml2::vni_ranges: - - '1:1000' neutron::plugins::ml2::type_drivers: - flat - gre @@ -29,4 +25,4 @@ sysctl_settings: net.ipv4.tcp_keepalive_probes: value: 5 net.ipv4.tcp_keepalive_time: - value: 5
\ No newline at end of file + value: 5 |