@@ -2,7 +2,7 @@

 Name:           cloud-init

 Version:        0.7.9

-Release:        12%{?dist}

+Release:        13%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

@@ -20,6 +20,7 @@ Patch4:         resizePartitionUUID.patch

 Patch5:         datasource-guestinfo.patch

 Patch6:         systemd-service-changes.patch

 Patch7:         makecheck.patch

+Patch8:         systemd-resolved-config.patch

 BuildRequires:  python3

 BuildRequires:  python3-libs

@@ -64,6 +65,7 @@ ssh keys and to let the user run various scripts.

 %patch5 -p1

 %patch6 -p1

 %patch7 -p1

+%patch8 -p1

 find systemd -name cloud*.service | xargs sed -i s/StandardOutput=journal+console/StandardOutput=journal/g

@@ -134,6 +136,8 @@ rm -rf $RPM_BUILD_ROOT

 %changelog

+*   Mon Oct 16 2017 Vinay Kulkarni <kulakrniv@vmware.com> 0.7.9-13

+-   Support configuration of systemd resolved.conf

 *   Wed Sep 20 2017 Alexey Makhalov <amakhalov@vmware.com> 0.7.9-12

 -   Requires net-tools or toybox

 *   Wed Sep 20 2017 Anish Swaminathan <anishs@vmware.com> 0.7.9-11

new file mode 100644

@@ -0,0 +1,51 @@

+diff -uNr cloud-init-0.7.9-orig/cloudinit/config/cc_resolv_conf.py cloud-init-0.7.9/cloudinit/config/cc_resolv_conf.py

+--- cloud-init-0.7.9-orig/cloudinit/config/cc_resolv_conf.py	2017-10-16 18:28:37.374850375 +0000

+@@ -55,10 +55,10 @@

+ 

+ frequency = PER_INSTANCE

+ 

+-distros = ['fedora', 'rhel', 'sles']

++distros = ['fedora', 'rhel', 'sles', 'photon']

+ 

+ 

+-def generate_resolv_conf(template_fn, params, target_fname="/etc/resolv.conf"):

++def generate_resolv_conf(template_fn, params, target_fname="/etc/systemd/resolved.conf"):

+     flags = []

+     false_flags = []

+ 

+@@ -104,12 +104,13 @@

+     if "resolv_conf" not in cfg:

+         log.warn("manage_resolv_conf True but no parameters provided!")

+ 

+-    template_fn = cloud.get_template_filename('resolv.conf')

++    template_fn = cloud.get_template_filename('systemd.resolved.conf')

+     if not template_fn:

+-        log.warn("No template found, not rendering /etc/resolv.conf")

++        log.warn("No template found, not rendering /etc/systemd/resolved.conf")

+         return

+ 

+     generate_resolv_conf(template_fn=template_fn, params=cfg["resolv_conf"])

++    util.subp(["systemctl", "restart", "systemd-resolved"])

+     return

+ 

+ # vi: ts=4 expandtab

+diff -uNr cloud-init-0.7.9-orig/templates/systemd.resolved.conf.tmpl cloud-init-0.7.9/templates/systemd.resolved.conf.tmpl

+--- cloud-init-0.7.9-orig/templates/systemd.resolved.conf.tmpl	1970-01-01 00:00:00.000000000 +0000

+@@ -0,0 +1,15 @@

++## template:jinja

++# Your system has been configured with 'manage-resolv-conf' set to true.

++# As a result, cloud-init has written this file with configuration data

++# that it has been provided. Cloud-init, by default, will write this file

++# a single time (PER_ONCE).

++#

++[Resolve]

++LLMNR=false

++{% if nameservers is defined %}

++DNS={% for server in nameservers %}{{server}} {% endfor %}

++{% endif %}

++

++{% if searchdomains is defined %}

++Domains={% for search in searchdomains %}{{search}} {% endfor %}

++{% endif %}