Merge "Fix naming and ips for controller and compute"
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>
Wed, 5 Oct 2016 09:15:08 +0000 (09:15 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 5 Oct 2016 09:15:08 +0000 (09:15 +0000)

Trivial merge