diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-16 16:46:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-16 16:46:02 +0000 |
| commit | 0e05daaf5e70f3980beda57bfadbff52adca16cb (patch) | |
| tree | 885660860507df9f2964bbdcc9d1f117461fc5dc /mcp | |
| parent | e45c95993f33f38ef2a92a7b277e5888815df0c5 (diff) | |
| parent | fb02a554ddc8dfefcfcd57476485b3ac3a549dde (diff) | |
Merge "Enable neutron trunk ports" into stable/euphrates
Diffstat (limited to 'mcp')
5 files changed, 11 insertions, 0 deletions
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 |