From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 19 Feb 2016 09:36:07 +0000 (+0000)
Subject: Merge "Add TripleO Heat Template Parameters for Neutron Tenant MTU"
X-Git-Tag: opnfv-6.0.0~2174
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=deec3c56abe3795d21c911ce2d25e5d98218a5a2;p=apex-tripleo-heat-templates.git

Merge "Add TripleO Heat Template Parameters for Neutron Tenant MTU"
---

deec3c56abe3795d21c911ce2d25e5d98218a5a2
diff --cc puppet/controller.yaml
index c664cac3,15dbf598..36003104
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@@ -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}