Merge "OpenContrail heat templates"

diff --cc puppet/compute.yaml
Simple merge

diff --cc puppet/controller.yaml
Simple merge

diff --cc puppet/manifests/overcloud_compute.pp
Simple merge

diff --cc puppet/manifests/overcloud_controller.pp
Simple merge

diff --cc puppet/manifests/overcloud_controller_pacemaker.pp
index 20ff49c,c41ab2c..c6c69b7
--- 1/puppet/manifests/overcloud_controller_pacemaker.pp
--- 2/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@@ -678,9 -654,12 +678,12 @@@ if hiera('step') >= 3 
    if  hiera('neutron::core_plugin') == 'neutron.plugins.nuage.plugin.NuagePlugin' {
      include ::neutron::plugins::nuage
    }
+   if  hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' {
+     include ::neutron::plugins::opencontrail
+   }
    if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
      class {'::neutron::plugins::midonet':
 -      midonet_api_ip    => $public_vip,
 +      midonet_api_ip    => hiera('tripleo::loadbalancer::public_virtual_ip'),
        keystone_tenant   => hiera('neutron::server::auth_tenant'),
        keystone_password => hiera('neutron::server::auth_password')
      }