cac3ed855c
This PS fixes some bugs that causes trunk not to work for kolla-kubernetes. Change-Id: I4eaba87c9c75a85ac16823a77ab197e62254e66e