Merge "Support running on openstack which enabled https" into stable/danube
authorMorgan Richomme <morgan.richomme@orange.com>
Thu, 23 Mar 2017 17:58:38 +0000 (17:58 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 23 Mar 2017 17:58:38 +0000 (17:58 +0000)

Trivial merge