@@ -21,19 +21,19 @@ diff -rup cloud-init-18.3/cloudinit/sources/helpers/azure.py cloud-init-18.3-new

  from cloudinit.net import dhcp

  from cloudinit import stages

-@@ -16,9 +17,10 @@ from xml.etree import ElementTree

- 

+@@ -18,9 +18,10 @@

  from cloudinit import url_helper

  from cloudinit import util

+ from cloudinit.reporting import events

 +from io import StringIO

  LOG = logging.getLogger(__name__)

 -

 +NETWORKD_LEASES_DIR = '/run/systemd/netif/leases'

- @contextmanager

- def cd(newdir):

-@@ -281,6 +283,32 @@ class WALinuxAgentShim(object):

+ azure_ds_reporter = events.ReportEventStack(

+     name="azure-ds",

+@@ -332,6 +333,32 @@

          return dhcp_options

      @staticmethod

@@ -63,9 +63,9 @@ diff -rup cloud-init-18.3/cloudinit/sources/helpers/azure.py cloud-init-18.3-new

 +        return ret

 +

 +    @staticmethod

+     @azure_ds_telemetry_reporter

      def _get_value_from_dhcpoptions(dhcp_options):

          if dhcp_options is None:

-             return None

 @@ -306,8 +334,9 @@ class WALinuxAgentShim(object):

              # Option-245 stored in /run/cloud-init/dhclient.hooks/<ifc>.json

              # a dhclient exit hook that calls cloud-init-dhclient-hook

@@ -1,8 +1,8 @@

 %define python3_sitelib /usr/lib/python3.7/site-packages

 Name:           cloud-init

-Version:        18.3

-Release:        4%{?dist}

+Version:        19.1

+Release:        1%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

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

 Vendor:         VMware, Inc

 Distribution:   Photon

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

-%define sha1 cloud-init=a317e2add93578d244328dcf97d46fad1c3140f9

+%define sha1 cloud-init=6de398dd755959dde47c8d6f6e255a0857017c44

 Source1:        cloud-photon.cfg

 Source2:        99-disable-networking-config.cfg

@@ -138,15 +138,17 @@ rm -rf $RPM_BUILD_ROOT

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

 /lib/udev/rules.d/66-azure-ephemeral.rules

 /lib/systemd/system/*

-/etc/bash_completion.d/cloud-init

 %{_docdir}/cloud-init/*

 %{_libdir}/cloud-init/*

 %{python3_sitelib}/*

 %{_bindir}/cloud-init*

+%{_bindir}/cloud-id

+%{_datadir}/bash-completion/completions/cloud-init

 %dir /var/lib/cloud

-

 %changelog

+*   Tue Jun 25 2019 Keerthana K <keerthanak@vmware.com> 19.1-1

+-   Upgrade to version 19.1 and fix cloud-init GOS logic.

 *   Thu Jun 13 2019 Keerthana K <keerthanak@vmware.com> 18.3-4

 -   Fix to delete the contents of /etc/systemd/network dir at the beginning

 -   of write_network instead of looping through each NIC and delete the contents

@@ -53,7 +53,7 @@ cloud_init_modules:

  - resizefs

  - set_hostname

  - update_hostname

-# - update_etc_hosts

+ - update_etc_hosts

 # - ca-certs

 # - rsyslog

  - users-groups

@@ -70,7 +70,7 @@ cloud_config_modules:

 # - set-passwords

  - package-update-upgrade-install

 # - landscape

-# - timezone

+ - timezone

 # - puppet

 # - chef

 # - salt-minion

@@ -105,3 +105,5 @@ system_info:

       templates_dir: /etc/cloud/templates/

    ssh_svcname: sshd

+

+manage_etc_hosts: true

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

 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-new/cloudinit/distros/photon.py	2017-05-15 05:13:49.156848344 -0700

-@@ -0,0 +1,320 @@

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

+@@ -0,0 +1,335 @@

 +# vi: ts=4 expandtab

 +#

 +# Copyright (C) 2017 VMware Inc.

@@ -9,6 +9,7 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +#

 +

 +import os

++import fnmatch

 +

 +from cloudinit import distros

 +from cloudinit import helpers

@@ -16,6 +17,7 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +from cloudinit import util

 +from cloudinit.distros import net_util

 +from cloudinit.distros.parsers.hostname import HostnameConf

++from cloudinit.net.network_state import mask_to_net_prefix

 +

 +from cloudinit.settings import PER_INSTANCE

 +

@@ -57,7 +59,6 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +        entries = net_util.translate_network(settings)

 +        LOG.debug("Translated ubuntu style network settings %s into %s",

 +                  settings, entries)

-+        util.delete_dir_contents(self.network_conf_dir)

 +        route_entries = []

 +        route_entries = translate_routes(settings)

 +        dev_names = entries.keys()

@@ -66,9 +67,17 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +        searchdomains = []

 +        # Format for systemd

 +        for (dev, info) in entries.items():

++            if 'dns-nameservers' in info:

++                nameservers.extend(info['dns-nameservers'])

++            if 'dns-search' in info:

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

 +            if dev == 'lo':

 +                continue

-+            net_fn = self.network_conf_dir + str(dev_index) + '-' + dev + '.network'

++            net_fn = network_file_name(self.network_conf_dir, dev)

++            if not net_fn:

++               net_fn = self.network_conf_dir + str(dev_index) + '-' + dev + '.network'

++            else:

++                net_fn = self.network_conf_dir + net_fn

 +            dhcp_enabled = 'no'

 +            if info.get('bootproto') == 'dhcp':

 +                dhcp_enabled = 'yes'        

@@ -81,7 +90,7 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +            if info.get('address'):

 +                net_cfg['Address'] = "%s" % (info.get('address'))

 +                if info.get('netmask'):

-+                    net_cfg['Address'] += "/%s" % (info.get('netmask'))

++                    net_cfg['Address'] += "/%s" % (mask_to_net_prefix(info.get('netmask')))

 +            if info.get('gateway'):

 +                net_cfg['Gateway'] = info.get('gateway')

 +            if info.get('dns-nameservers'):

@@ -105,11 +114,6 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +

 +            if info.get('auto'):

 +                self._write_interface_file(net_fn, net_cfg, route_entry)

-+            if 'dns-nameservers' in info:

-+                nameservers.extend(info['dns-nameservers'])

-+            if 'dns-search' in info:

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

-+            dev_index = dev_index + 1;

 +

 +        resolve_data = []

 +        new_resolve_data = []

@@ -146,6 +150,8 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +                content += "Address=%s\n" % (net_cfg['Address'])

 +            if 'Gateway' in net_cfg:

 +                content += "Gateway=%s\n" % (net_cfg['Gateway'])

++            if 'DHCP' in net_cfg and net_cfg['DHCP'] == 'no':

++                content += "DHCP=%s\n" % (net_cfg['DHCP'])

 +            route_index = 0

 +            found = True

 +            if route_entry:

@@ -322,3 +328,12 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +        else:

 +            out_ifaces[dev_name] = route_info

 +    return out_ifaces

++

++def network_file_name(dirname, dev_name):

++    network_file_pattern = "*"+dev_name+".network*"

++    for node in os.listdir(dirname):

++        node_fullpath = os.path.join(dirname, node)

++        if fnmatch.fnmatch(node, network_file_pattern):

++           util.del_file(node_fullpath)

++           return node

++    return ""