puppet generates wrong dnsmasq.upstream in cobbler container

[frido]

When entering two different DNS resolvers in the UI, the puppet template in the cobbler container generates a corrupt dnsmasq.upstream file causing resolving to break:

/etc/dnsmasq.upstream:

domain vm.zolder.org
search domain.tld
nameserver 212.79.255.18,212.79.255.19

last line doesn't except a comma.

[frido (fga)]

attached puppet template solved problem for me

[Nastya Urlapova (aurlapova)]

Please, provide iso version and diagnostic shapshot.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/100609

[Matthew Mosesohn (raytrac3r)]

Hi Frido,
Thanks for the bug post. I was able to reproduce this quite easily. It's easier to fix this in fuelmenu, so I've added a commit there.

[frido (fga)]

Matthew,

Note that with multiple dns servers the entries should be on seperate lines:

domain domain.tld
search domain.tld
nameserver 212.79.255.18
nameserver 212.79.255.19

Also how will this change propagate into the cobbler docker instance ?

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/100899

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/100609
Committed: https://git.openstack.org/cgit/stackforge/fuel-web/commit/?id=1512e723c76dd2abaf7ae834dedc14012864545d
Submitter: Jenkins
Branch: master

commit 1512e723c76dd2abaf7ae834dedc14012864545d
Author: Matthew Mosesohn <email address hidden>
Date: Tue Jun 17 20:00:07 2014 +0400

    Write correct upstream nameservers

    Fuelmenu was saving DNS_UPSTREAM with the format
    server1,server2 instead of server1 server2,
    breaking DNS lookups.

    Change-Id: I0c06454d867b995bc7d51df0a0199a21e1481384
    Partial-Bug: #1327799

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/5.0
Review: https://review.openstack.org/101066

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/101066
Committed: https://git.openstack.org/cgit/stackforge/fuel-web/commit/?id=3c3298ededbf876f08fa3937e434516f3e874c40
Submitter: Jenkins
Branch: stable/5.0

commit 3c3298ededbf876f08fa3937e434516f3e874c40
Author: Matthew Mosesohn <email address hidden>
Date: Tue Jun 17 20:00:07 2014 +0400

    Write correct upstream nameservers

    Fuelmenu was saving DNS_UPSTREAM with the format
    server1,server2 instead of server1 server2,
    breaking DNS lookups.

    Change-Id: I0c06454d867b995bc7d51df0a0199a21e1481384
    Partial-Bug: #1327799
    (cherry picked from commit 1512e723c76dd2abaf7ae834dedc14012864545d)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/100899
Committed: https://git.openstack.org/cgit/stackforge/fuel-library/commit/?id=25fc895bc845ab8269745bd4c71e8f229f4a6a39
Submitter: Jenkins
Branch: master

commit 25fc895bc845ab8269745bd4c71e8f229f4a6a39
Author: Matthew Mosesohn <email address hidden>
Date: Wed Jun 18 16:54:01 2014 +0400

    Fix support for multiple upstream dns servers

    Added handler to dnsmasq.upstream template to
    properly write nameserver entries for multiple
    upstream DNS servers.

    Change-Id: Ide20e0472962c99562b6618abd7d766e7de6db22
    Partial-Bug: #1327799