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/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml | |
parent | e45c95993f33f38ef2a92a7b277e5888815df0c5 (diff) | |
parent | fb02a554ddc8dfefcfcd57476485b3ac3a549dde (diff) |
Merge "Enable neutron trunk ports" into stable/euphrates
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml')
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml | 3 |
1 files changed, 3 insertions, 0 deletions
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 |