Merge "Implement Workers parameters"

diff --cc puppet/controller.yaml
index e405333,c64a60c..7089f60
--- 1/puppet/controller.yaml
--- 2/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}