Change in ovirt-engine[ovirt-engine-3.4]: core: Cloud init wants DNS inside interface

[iheim at redhat.com]

Itamar Heim has submitted this change and it was merged.

Change subject: core: Cloud init wants DNS inside interface
......................................................................


core: Cloud init wants DNS inside interface

Cloud-init expects the DNS information inside the network interface
definition, like this:

  iface eth0 inet static
    address 192.168.0.1
    netmask 255.255.255.0
    gateway 192.168.0.1
    dns-nameservers 1.1.1.1 2.2.2.2
    dns-search example.com
  auto eth0

But we put it outside, like this:

  dns-nameservers 1.1.1.1 2.2.2.2
  dns-search example.com
  iface eth0 inet static
    address 192.168.0.1
    netmask 255.255.255.0
    gateway 192.168.0.1
  auto eth0

The way we do it looks more correct, as the list of name servers and
search domains isn't specific to a network interface, but common to all
of them. But cloud-init doesn't like this. This patch changes the engine
so that it generates the format that cloud-init wants.

Change-Id: I79f758544496bedaf4e220639a9768a2518579f6
Bug-Url: https://bugzilla.redhat.com/1067906
Signed-off-by: Juan Hernandez <juan.hernandez at redhat.com>
(cherry picked from commit 4f34b420dab30ef40966aa3b5b7c8b0a0638bc65)
---
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java
1 file changed, 13 insertions(+), 13 deletions(-)

Approvals:
  Greg Padgett: Looks good to me, but someone else must approve
  Juan Hernandez: Verified
  Omer Frenkel: Looks good to me, approved
  Oved Ourfali: Looks good to me, but someone else must approve



-- 
To view, visit http://gerrit.ovirt.org/24860
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I79f758544496bedaf4e220639a9768a2518579f6
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: David Caro <dcaroest at redhat.com>
Gerrit-Reviewer: Greg Padgett <gpadgett at redhat.com>
Gerrit-Reviewer: Itamar Heim <iheim at redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel at redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: Shahar Havivi <shavivi at redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server