Merge "Add TripleO Heat Template Parameters for Neutron Tenant MTU"
authorJenkins <jenkins@review.openstack.org>
Fri, 19 Feb 2016 09:36:07 +0000 (09:36 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 19 Feb 2016 09:36:07 +0000 (09:36 +0000)
1  2 
overcloud.yaml
puppet/controller.yaml

diff --cc overcloud.yaml
Simple merge
@@@ -1475,8 -1476,8 +1486,9 @@@ resources
                  nova::api::osapi_compute_workers: {get_input: nova_workers}
                  nova::api::ec2_workers: {get_input: nova_workers}
                  nova::api::metadata_workers: {get_input: nova_workers}
+                 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}
                  nova::api::neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
                  nova::api::instance_name_template: {get_input: instance_name_template}