diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-05 15:24:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-05 15:24:46 +0000 |
| commit | 698e65274ed8e9bb31f0d101bade1bd5ee14e0b6 (patch) | |
| tree | e93cb400c25aaaa60e5b1d34ab8a06127449de49 /puppet/hieradata | |
| parent | d625668939eb4a45440659e808a7b72fc21334fe (diff) | |
| parent | c26b53ca42c2cde70db091b40c04e775acb40e29 (diff) | |
Merge "Fix list of type_drivers for ML2 plugin"
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/common.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index 5901a9cf..40c44aef 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -17,6 +17,11 @@ neutron::plugins::ml2::tunnel_id_ranges: - '1:1000' neutron::plugins::ml2::vni_ranges: - '1:1000' +neutron::plugins::ml2::type_drivers: + - flat + - gre + - vxlan + - vlan sysctl_settings: net.ipv4.tcp_keepalive_intvl: |