From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 17 Dec 2015 18:13:58 +0000 (+0000)
Subject: Merge "Implement Workers parameters"
X-Git-Tag: opnfv-6.0.0~2255
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ad18ee26299f6e45f47fb70d3c4805d8d11b3cc3;p=apex-tripleo-heat-templates.git

Merge "Implement Workers parameters"
---

ad18ee26299f6e45f47fb70d3c4805d8d11b3cc3
diff --cc puppet/controller.yaml
index e405333d,c64a60c5..7089f60b
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@@ -1249,9 -1294,10 +1299,10 @@@ resources
                  neutron::agents::ml2::ovs::l2_population: {get_input: neutron_enable_l2pop}
                  neutron::agents::dhcp::enable_isolated_metadata: {get_input: neutron_enable_isolated_metadata}
                  neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip}
 -                neutron_flat_networks: {get_input: neutron_flat_networks}
 +                neutron::plugins::ml2::flat_networks: {get_input: neutron_flat_networks}
                  neutron::agents::metadata::shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
                  neutron::agents::metadata::metadata_ip: {get_input: neutron_api_network}
+                 neutron::agents::metadata::metadata_workers: {get_input: neutron_workers}
                  neutron_agent_mode: {get_input: neutron_agent_mode}
                  neutron_router_distributed: {get_input: neutron_router_distributed}
                  neutron::core_plugin: {get_input: neutron_core_plugin}