From: Ben Nemec <bnemec@redhat.com>
Date: Mon, 18 Jan 2016 23:39:38 +0000 (-0600)
Subject: Fix tunnel_types hieradata on compute nodes
X-Git-Tag: opnfv-6.0.0~2219^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=11c5ab45017de16a06de7f4a7eed814dd5efcc25;p=apex-tripleo-heat-templates.git

Fix tunnel_types hieradata on compute nodes

There was a missing : in the hieradata for the compute nodes that
caused tunnel_types to not be configured.  This also made it
impossible to boot instances on tunneled networks because the port
binding always failed.

Change-Id: Icc2a45aa9514ce62497f91e6abe9261d1c1374ed
Partial-Bug: 1534349
---

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index f4165756..9ebc8f41 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -487,7 +487,7 @@ resources:
                 neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip}
 
                 neutron::plugins::ml2::tenant_network_types: {get_input: neutron_tenant_network_types}
-                neutron::agents::ml2::ovs:tunnel_types: {get_input: neutron_tunnel_types}
+                neutron::agents::ml2::ovs::tunnel_types: {get_input: neutron_tunnel_types}
                 neutron::agents::ml2::ovs::extensions: {get_input: neutron_agent_extensions}
                 neutron::plugins::ml2::network_vlan_ranges: {get_input: neutron_network_vlan_ranges}
                 neutron::plugins::ml2::tunnel_id_ranges: {get_input: neutron_tunnel_id_ranges}