new file mode 100644

@@ -0,0 +1 @@

+network: {config: disabled}

@@ -1,6 +1,6 @@

 Name:           cloud-init

 Version:        0.7.9

-Release:        2%{?dist}

+Release:        3%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

@@ -8,6 +8,7 @@ URL:            http://launchpad.net/cloud-init

 Source0:        https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz

 %define sha1 cloud-init=3b4345267e72e28b877e2e3f0735c1f672674cfc

 Source1:        cloud-photon.cfg

+Source2:        99-disable-networking-config.cfg

 Patch0:         photon-distro.patch

 Patch1:         change-requires.patch

@@ -72,9 +73,12 @@ rm -rf $RPM_BUILD_ROOT

 rm -r $RPM_BUILD_ROOT%{python_sitelib}/tests

 mkdir -p $RPM_BUILD_ROOT/var/lib/cloud

+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg.d/

 # We supply our own config file since our software differs from Ubuntu's.

 cp -p %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg

+# Disable networking config by cloud-init

+cp -p %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg.d/

 %check

 openssl req \

@@ -142,6 +146,7 @@ rm -rf $RPM_BUILD_ROOT

 %config(noreplace) %{_sysconfdir}/cloud/templates/*

 %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/05_logging.cfg

 %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg

+%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/99-disable-networking-config.cfg

 %{_sysconfdir}/NetworkManager/dispatcher.d/hook-network-manager

 %{_sysconfdir}/dhcp/dhclient-exit-hooks.d/hook-dhclient

 /lib/systemd/system-generators/cloud-init-generator

@@ -155,6 +160,8 @@ rm -rf $RPM_BUILD_ROOT

 %changelog

+*   Thu May 15 2017 Anish Swaminathan <anishs@vmware.com> 0.7.9-3

+-   Disable networking config by cloud-init

 *   Thu May 04 2017 Anish Swaminathan <anishs@vmware.com> 0.7.9-2

 -   Support userdata in vmx guestinfo

 *   Thu Apr 27 2017 Anish Swaminathan <anishs@vmware.com> 0.7.9-1

@@ -1,7 +1,7 @@

-=== added file './cloudinit/distros/photon.py'

-+++ ./cloudinit/distros/photon.py	2017-04-17 01:28:00 +0000

-@@ -0,0 +1,299 @@

+diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/cloudinit/distros/photon.py

+--- cloud-init-0.7.9/cloudinit/distros/photon.py	1969-12-31 16:00:00.000000000 -0800

+@@ -0,0 +1,319 @@

 +# vi: ts=4 expandtab

 +#

 +# Copyright (C) 2017 VMware Inc.

@@ -25,7 +25,7 @@

 +    hostname_conf_fn = "/etc/hostname"

 +    locale_conf_fn = "/etc/default/locale"

 +    network_conf_dir = "/etc/systemd/network/"

-+    resolve_conf_fn = "/etc/resolv.conf"

++    resolve_conf_fn = "/etc/systemd/resolved.conf"

 +    init_cmd = ['systemctl']  # init scripts

 +

 +    def __init__(self, name, cfg, paths):

@@ -110,9 +110,23 @@

 +                searchdomains.extend(info['dns-search'])

 +            dev_index = dev_index + 1;

 +

++        resolve_data = []

++        new_resolve_data = []

++        with open(self.resolve_conf_fn, "r") as rf:

++            resolve_data = rf.readlines()

++        LOG.debug("Old Resolve Data\n")

++        LOG.debug("%s",resolve_data)

++        for item in resolve_data:

++            if (nameservers and ('DNS=' in item)) or (searchdomains and ('Domains=' in item)):

++                continue

++            else:

++                new_resolve_data.append(item)

++        

++        new_resolve_data = new_resolve_data +  convert_resolv_conf(nameservers, searchdomains)

++        LOG.debug("New resolve data\n")

++        LOG.debug("%s",new_resolve_data)

 +        if nameservers or searchdomains:

-+            util.write_file(self.resolve_conf_fn,

-+                            convert_resolv_conf(nameservers, searchdomains))

++            util.write_file(self.resolve_conf_fn, ''.join(new_resolve_data))

 +

 +        return dev_names

 +

@@ -150,7 +164,7 @@

 +

 +

 +    def _bring_up_interfaces(self, device_names):

-+        cmd = ['systemctl', 'restart', 'systemd-networkd', 'systemd-resolved']

++        cmd = ['systemctl', 'status', 'systemd-networkd', 'systemd-resolved']

 +        LOG.debug("Attempting to run bring up interfaces using command %s",

 +                  cmd)

 +        try:

@@ -236,13 +250,19 @@

 +

 +def convert_resolv_conf(nameservers, searchdomains):

 +    """Returns a string formatted for resolv.conf."""

-+    result = ''

++    result = []

 +    if isinstance(nameservers, list):

++        nslist = "DNS="

 +        for ns in nameservers:

-+            result = result + 'nameserver %s\n' % ns

++            nslist = nslist + '%s ' % ns

++        nslist = nslist + '\n'

++        result.append(str(nslist))

 +    if isinstance(searchdomains, list):

++        sdlist = "Domains="

 +        for sd in searchdomains:

-+            result = result + 'search %s\n' % sd

++            sdlist = sdlist + '%s ' % sd

++        sdlist = sdlist + '\n'

++        result.append(str(sdlist))

 +    return result

 +

 +def translate_routes(settings):