2 Commits

Author SHA1 Message Date
Numan Siddique
371e5d6264 ovn: Add dns_servers configuration support
networking-ovn optionally expects list of dns server to be defined in the
config -'ovn/dns_servers'. These will be included in the 'dns_server' DHCP
option field when the VMs send DHCP request if the subnet's dns_nameservers field
is not defined by the user.

This patch sets the hieradata - 'neutron::plugins::ml2::ovn::dns_servers' to the
defined OVNDnsServers t-h-t param.

Change-Id: I80574f7badfcc618254266051c8d6661c08e2be0
Closes-bug: #1774052
2018-06-25 16:10:56 +05:30
Dan Prince
e691bbe026 Default environment/services/* to docker
This updates the relevant environment/services templates so that
they also default to docker. Without this change users of these
services could end up with mismatched (unsupported) deployments.

Additionally, this picks environment/services-docker as the
source of truth when resolving collisions for moving those over
environment/services. So environment/services now contain all of
the containerized services' env files used to be located in
environment/services-docker. The latter will be deleted later to
prevent future desync of contents.

Co-authored-by: Bogdan Dobrelya <bdobreli@redhat.com>
Change-Id: I923731f46ea26582160a11d2dfe85792ab74110b
2018-03-27 11:24:08 +02:00