fix nova-network vs. openstack-network conflict

Having both nova-network and openstack-network::server in the run_list
caused conflicts when installing packages.

Change-Id: I105eab62d49c1e6d36e2416ae44c73f551d062e5
Merge "fix nova-network vs. openstack-network conflict"