diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-07-11 18:03:28 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-07-11 18:03:29 +0000 |
commit | 0dd151201f86688ce8cf1773ccacf69932a996c1 (patch) | |
tree | 0f96d5b1f4a21a820d9b1636e5d13db3fc6dc8ee /puppet/controller.yaml | |
parent | 47f4414895c2e526e3c76abde350bdc22896e4ca (diff) | |
parent | 2a64b67cef74fff86ce6b56b15431b859515844d (diff) |
Merge "neutron: remove tenant MTU configuration options"
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r-- | puppet/controller.yaml | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 0d6e4028..33729734 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -236,15 +236,6 @@ parameters: default: nic1 description: What interface to bridge onto br-ex for network nodes. type: string - NeutronTenantMtu: - description: > - The default MTU for tenant networks. For VXLAN/GRE tunneling, this should - be at least 50 bytes smaller than the MTU on the physical network. This - value will be used to set the MTU on the virtual Ethernet device. - This number is related to the value of NeutronDnsmasqOptions, since that - will determine the MTU that is assigned to the VM host through DHCP. - default: 1400 - type: number NovaEnableDBPurge: default: true description: | @@ -591,7 +582,6 @@ resources: CLUSTER: {get_param: MysqlClusterUniquePart} neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret} neutron_password: {get_param: NeutronPassword} - neutron_tenant_mtu: {get_param: NeutronTenantMtu} neutron_internal_url: { get_param: [ EndpointMap, NeutronInternal, uri ] } neutron_public_url: { get_param: [ EndpointMap, NeutronPublic, uri ] } neutron_admin_url: { get_param: [ EndpointMap, NeutronAdmin, uri ] } @@ -863,7 +853,6 @@ resources: # Neutron neutron::bind_host: {get_input: neutron_api_network} - neutron::network_device_mtu: {get_input: neutron_tenant_mtu} neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip} neutron::agents::metadata::metadata_ip: {get_input: neutron_api_network} neutron::keystone::auth::public_url: {get_input: neutron_public_url } @@ -957,7 +946,6 @@ resources: nova::api::api_bind_address: {get_input: nova_api_network} nova::api::metadata_listen: {get_input: nova_metadata_network} nova::api::admin_password: {get_input: nova_password} - nova::compute::network_device_mtu: {get_input: neutron_tenant_mtu} nova::database_connection: {get_input: nova_dsn} nova::api_database_connection: {get_input: nova_api_dsn} nova::glance_api_servers: {get_input: glance_api_servers} |