summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/virtual-mcp-ocata-common
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-11-14 18:19:33 +0400
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-15 16:50:15 +0000
commitfb02a554ddc8dfefcfcd57476485b3ac3a549dde (patch)
tree88fd6547fde33e3903947575cb6b883e291d3bd3 /mcp/reclass/classes/cluster/virtual-mcp-ocata-common
parent12c1749e6bd339dc23f155d6990e30f54245c88d (diff)
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)
Diffstat (limited to 'mcp/reclass/classes/cluster/virtual-mcp-ocata-common')
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml1
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml3
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml1
3 files changed, 5 insertions, 0 deletions
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