From fb02a554ddc8dfefcfcd57476485b3ac3a549dde Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Tue, 14 Nov 2017 18:19:33 +0400
Subject: Enable neutron trunk ports

The network trunk service allows multiple networks to be
connected to an instance using a single virtual NIC.

JIRA: FUEL-303
Change-Id: Id9e7c122bc1a32a59f18167e332ceaaa3897b5ef
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 66e745c73ac2aba1ef93ba90db4b167e49813863)
---
 .../classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml   | 3 +++
 .../classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml   | 3 +++
 .../classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml     | 1 +
 .../classes/cluster/virtual-mcp-ocata-common/openstack_control.yml     | 3 +++
 .../classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml     | 1 +
 5 files changed, 11 insertions(+)

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
index 7d3dcb075..30dda2f7f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
@@ -52,3 +52,6 @@ parameters:
         sysctl:
           vm.dirty_ratio: 10
           vm.dirty_background_ratio: 5
+  neutron:
+    gateway:
+      vlan_aware_vms: true
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml
index 2aa05f07d..6d942281c 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml
@@ -46,6 +46,9 @@ parameters:
       interface:
         dhcp: ${_param:linux_dhcp_interface}
         single: ${_param:linux_single_interface}
+  neutron:
+    server:
+      vlan_aware_vms: true
   keystone:
     server:
       cacert: /etc/ssl/certs/mcp_os_cacert
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
index 4a48b360e..ad0675475 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
@@ -37,6 +37,7 @@ parameters:
   neutron:
     compute:
       notification: true
+      vlan_aware_vms: true
       agent_mode: ${_param:neutron_compute_agent_mode}
       message_queue:
         host: ${_param:openstack_control_address}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
index 2288e687f..ab5833910 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
@@ -143,3 +143,6 @@ parameters:
                 - rw
                 - no_root_squash
                 - async
+  neutron:
+    server:
+      vlan_aware_vms: true
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
index c776babcc..4ed8eed77 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
@@ -20,6 +20,7 @@ parameters:
     gateway:
       notification: true
       agent_mode: ${_param:neutron_gateway_agent_mode}
+      vlan_aware_vms: true
   linux:
     network:
       bridge: openvswitch
-- 
cgit 1.2.3-korg