Cherry pick from http://review.openstack.org/#/c/52526/

Fix eth1/eth0 changes

eth1 is the external interface.

Change-Id: I2f8826842c6b0c4411a3ffeb3d700444abb9d911