diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-15 16:50:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-15 16:50:12 +0000 |
| commit | bed48658ab74621497baec331d7cdd2c1ef51062 (patch) | |
| tree | d37b0533a27dcd1b72bfd743a18de7a8679a2465 /mcp/reclass/classes/cluster/virtual-mcp-ocata-common | |
| parent | f3a355d5644a7271d9df0a48febc3a93cceddb8e (diff) | |
| parent | 66e745c73ac2aba1ef93ba90db4b167e49813863 (diff) | |
Merge "Enable neutron trunk ports"
Diffstat (limited to 'mcp/reclass/classes/cluster/virtual-mcp-ocata-common')
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 |