First step in Mitaka support: support ctl-only openstacks (2 nodes).
The docs have been recommending a unified networkmanager-ctl physical node now since Liberty, instead of the old 3-node approach. Obviously this has appeal for us, so get this done before doing any Mitaka-specific stuff. It really wasn't as hard as I thought... basically just worked with these few changes. We no longer assign an 'nm' name at all. (Also, this commit has my dev tarball in osp.py instead of the real thing, because there is no real thing yet.)
Showing with 145 additions and 107 deletions