Fixes https://github.com/rcbops/chef-cookbooks/issues/425
Adds internal-api to attributes which is based on the value of the management
network, service-api remains set by the public network and admin-api remains
set by the value of nova network from osops.
fixing merge conflict
Merge pull request #113 from jcannava/DE155

Merged automatically by jenkins after successful build test