Merge "Set ext net and name server in Shaker templates"
authorCedric Ollivier <cedric.ollivier@orange.com>
Thu, 21 Mar 2019 20:41:45 +0000 (20:41 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 21 Mar 2019 20:41:45 +0000 (20:41 +0000)

Trivial merge