Complete the change of adding public_endpoint option

Change-Id: I8190b102ab827a4cf4c23f0f350fae051c1d33f0
Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>