Update based on http://docs.openstack.org/havana/install-guide/install/apt/content/demo_per_tenant_router_network_config.html
Checkpoint. Not working yet.
Bring up em2 on compute nodes.
Added a missing fi.