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/baremetal-mcp-ocata-common | |
parent | f3a355d5644a7271d9df0a48febc3a93cceddb8e (diff) | |
parent | 66e745c73ac2aba1ef93ba90db4b167e49813863 (diff) |
Merge "Enable neutron trunk ports"
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common')
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml | 3 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml | 3 |
2 files changed, 6 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 |