new file mode 100644

@@ -0,0 +1,149 @@

+diff -rup cloud-init-0.7.9/cloudinit/sources/DataSourceAzure.py cloud-init-0.7.9-1/cloudinit/sources/DataSourceAzure.py

+--- cloud-init-0.7.9/cloudinit/sources/DataSourceAzure.py	2016-12-23 08:37:45.000000000 -0800

+@@ -23,12 +23,18 @@ LOG = logging.getLogger(__name__)

+ 

+ DS_NAME = 'Azure'

+ DEFAULT_METADATA = {"instance-id": "iid-AZURE-NODE"}

+-AGENT_START = ['service', 'walinuxagent', 'start']

++AGENT_START = ['systemctl', 'start', 'waagent']

+ AGENT_START_BUILTIN = "__builtin__"

+ BOUNCE_COMMAND = [

+     'sh', '-xc',

+     "i=$interface; x=0; ifdown $i || x=$?; ifup $i || x=$?; exit $x"

+ ]

++

++BOUNCE_COMMAND_PHOTON = [

++    'sh', '-xc',

++    ("i=$interface; x=0; ifconfig $i down || x=$?; "

++     "ifconfig $i up || x=$?; exit $x")

++]

+ # azure systems will always have a resource disk, and 66-azure-ephemeral.rules

+ # ensures that it gets linked to this path.

+ RESOURCE_DISK_PATH = '/dev/disk/cloud/azure_resource'

+@@ -40,7 +46,7 @@ BUILTIN_DS_CONFIG = {

+     'hostname_bounce': {

+         'interface': 'eth0',

+         'policy': True,

+-        'command': BOUNCE_COMMAND,

++        'command': 'builtin',

+         'hostname_command': 'hostname',

+     },

+     'disk_aliases': {'ephemeral0': RESOURCE_DISK_PATH},

+@@ -154,7 +160,7 @@ class DataSourceAzureNet(sources.DataSou

+ 

+             missing = util.log_time(logfunc=LOG.debug, msg="waiting for files",

+                                     func=wait_for_files,

+-                                    args=(fp_files,))

++                                    args=(fp_files,180))

+         if len(missing):

+             LOG.warn("Did not find files, but going on: %s", missing)

+ 

+@@ -362,7 +368,9 @@ def perform_hostname_bounce(hostname, cf

+     env['old_hostname'] = prev_hostname

+ 

+     if command == "builtin":

+-        command = BOUNCE_COMMAND

++        LOG.debug(

++                "Skipping network bounce: ifupdown utils aren't present.")

++        return

+ 

+     LOG.debug("pubhname: publishing hostname [%s]", msg)

+     shell = not isinstance(command, (list, tuple))

+@@ -396,7 +404,7 @@ def pubkeys_from_crt_files(flist):

+     return pubkeys

+ 

+ 

+-def wait_for_files(flist, maxwait=60, naplen=.5, log_pre=""):

++def wait_for_files(flist, maxwait, naplen=.5, log_pre=""):

+     need = set(flist)

+     waited = 0

+     while True:

+ 

+diff -rup cloud-init-0.7.9/cloudinit/sources/helpers/azure.py cloud-init-0.7.9-1/cloudinit/sources/helpers/azure.py

+--- cloud-init-0.7.9/cloudinit/sources/helpers/azure.py	2016-12-23 08:37:45.000000000 -0800

+@@ -8,16 +8,18 @@ import socket

+ import struct

+ import tempfile

+ import time

++import configobj

+ 

+ from cloudinit import stages

+ from contextlib import contextmanager

+ from xml.etree import ElementTree

+ 

+ from cloudinit import util

++from io import StringIO

+ 

+ 

+ LOG = logging.getLogger(__name__)

+-

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

+ 

+ @contextmanager

+ def cd(newdir):

+@@ -264,6 +266,32 @@ class WALinuxAgentShim(object):

+         return dhcp_options

+ 

+     @staticmethod

++    def networkd_parse_lease(content):

++        """Parse a systemd lease file content as in /run/systemd/netif/leases/

++        Parse this (almost) ini style file even though it says:

++          # This is private data. Do not parse.

++        Simply return a dictionary of key/values."""

++

++        return dict(configobj.ConfigObj(StringIO(content), list_values=False))

++

++    @staticmethod

++    def networkd_load_leases(leases_d=None):

++        """Return a dictionary of dictionaries representing each lease

++        found in lease_d.i

++        The top level key will be the filename, which is typically the ifindex."""

++

++        if leases_d is None:

++            leases_d = NETWORKD_LEASES_DIR

++

++        ret = {}

++        if not os.path.isdir(leases_d):

++            return ret

++        for lfile in os.listdir(leases_d):

++            ret[lfile] = WALinuxAgentShim.networkd_parse_lease(

++                util.load_file(os.path.join(leases_d, lfile)))

++        return ret

++

++    @staticmethod

+     def _get_value_from_dhcpoptions(dhcp_options):

+         if dhcp_options is None:

+             return None

+@@ -277,13 +305,28 @@ class WALinuxAgentShim(object):

+         return _value

+ 

+     @staticmethod

++    def networkd_get_option_from_leases(keyname, leases_d=None):

++        if leases_d is None:

++            leases_d = NETWORKD_LEASES_DIR

++        leases = WALinuxAgentShim.networkd_load_leases(leases_d=leases_d)

++        for ifindex, data in sorted(leases.items()):

++            if data.get(keyname):

++                return data[keyname]

++        return None

++

++    @staticmethod

++    def _networkd_get_value_from_leases(leases_d=None):

++        return WALinuxAgentShim.networkd_get_option_from_leases(

++            'OPTION_245', leases_d=leases_d)

++

++    @staticmethod

+     def find_endpoint(fallback_lease_file=None):

+         LOG.debug('Finding Azure endpoint...')

+         value = None

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

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

+-        dhcp_options = WALinuxAgentShim._load_dhclient_json()

+-        value = WALinuxAgentShim._get_value_from_dhcpoptions(dhcp_options)

++        value = WALinuxAgentShim._networkd_get_value_from_leases()

++        LOG.debug('networkd value from lease %s', value)

+         if value is None:

+             # Fallback and check the leases file if unsuccessful

+             LOG.debug("Unable to find endpoint in dhclient logs. "

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

 Name:           cloud-init

 Version:        0.7.9

-Release:        13%{?dist}

+Release:        14%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

@@ -21,6 +21,7 @@ Patch5:         datasource-guestinfo.patch

 Patch6:         systemd-service-changes.patch

 Patch7:         makecheck.patch

 Patch8:         systemd-resolved-config.patch

+Patch9:         cloud-init-azureds.patch

 BuildRequires:  python3

 BuildRequires:  python3-libs

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

 %patch6 -p1

 %patch7 -p1

 %patch8 -p1

+%patch9 -p1

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

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

 %changelog

+*   Wed Feb 28 2018 Anish Swaminathan <anishs@vmware.com> 0.7.9-14

+-   Add support for systemd constructs for azure DS

 *   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

@@ -19,8 +19,9 @@ diff -rup cloud-init-0.7.9/systemd/cloud-init.service cloud-init-0.7.9-new/syste

  Wants=cloud-init-local.service

  Wants=sshd-keygen.service

  Wants=sshd.service

-@@ -9,9 +8,7 @@ After=networking.service

+@@ -9,9 +8,8 @@ After=networking.service

  Before=network-online.target

++After=systemd-networkd-wait-online.service

  Before=sshd-keygen.service

  Before=sshd.service

 -Before=sysinit.target

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

 Summary:        Sudo

 Name:           sudo

 Version:        1.8.20p2

-Release:        4%{?dist}

+Release:        5%{?dist}

 License:        ISC

 URL:            https://www.sudo.ws/

 Group:          System Environment/Security

@@ -11,6 +11,7 @@ Source0:        http://www.sudo.ws/sudo/dist/%{name}-%{version}.tar.gz

 %define sha1    sudo=7aa187518735312a82c5fcb3d253ed700cb8c68e

 BuildRequires:  man-db

 BuildRequires:  Linux-PAM-devel

+BuildRequires:  sed

 Requires:       Linux-PAM

 Requires:       shadow

@@ -40,10 +41,9 @@ make install DESTDIR=%{buildroot}

 install -v -dm755 %{buildroot}/%{_docdir}/%{name}-%{version}

 find %{buildroot}/%{_libdir} -name '*.la' -delete

 find %{buildroot}/%{_libdir} -name '*.so~' -delete

-cat >> %{buildroot}/etc/sudoers << EOF

-%wheel ALL=(ALL) ALL

-%sudo   ALL=(ALL) ALL

-EOF

+sed -i '/#includedir.*/i \

+%wheel ALL=(ALL) ALL \

+%sudo   ALL=(ALL) ALL' %{buildroot}/etc/sudoers

 install -vdm755 %{buildroot}/etc/pam.d

 cat > %{buildroot}/etc/pam.d/sudo << EOF

 #%%PAM-1.0

@@ -90,6 +90,8 @@ rm -rf %{buildroot}/*

 %exclude  /etc/sudoers.dist

 %changelog

+*   Thu Mar 01 2018 Anish Swaminathan <anishs@vmware.com> 1.8.20p2-5

+-   Move includedir sudoers.d to end of sudoers file

 *   Tue Oct 10 2017 Alexey Makhalov <amakhalov@vmware.com> 1.8.20p2-4

 -   No direct toybox dependency, shadow depends on toybox

 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.8.20p2-3

@@ -8,9 +8,6 @@ ln -s ../docker.service docker.service

 ln -s ../waagent.service waagent.service

 ln -s ../sshd-keygen.service sshd-keygen.service

-#Disable cloud-init

-rm -rf /etc/systemd/system/cloud-init.target.wants

-

 # Remove ssh host keys and add script to regenerate them at boot time.

 rm -f /etc/ssh/ssh_host_*

@@ -58,4 +55,4 @@ sed -i 's/$photon_cmdline $systemd_cmdline/init=\/lib\/systemd\/systemd loglevel

 rm /boot/system.map*

 waagent -force -deprovision+user

-export HISTSIZE=0

\ No newline at end of file

+export HISTSIZE=0

@@ -5,8 +5,7 @@

 # when a 'default' entry is found it will reference the 'default_user'

 # from the distro configuration specified below

 users:

-   - name: root

-     lock-passwd: true

+   - default

 # If this is set, 'root' will not be able to ssh in and they 

 # will get a message to login instead as a different user

@@ -31,11 +30,13 @@ cloud_init_modules:

 # - seed_random

  - bootcmd

  - write-files

-# - growpart

-# - resizefs

+ - growpart

+ - resizefs

+ - disk_setup

+ - mounts

  - set_hostname

  - update_hostname

-# - update_etc_hosts

+ - update_etc_hosts

 # - ca-certs

 # - rsyslog

  - users-groups

@@ -46,8 +47,6 @@ cloud_config_modules:

 # Emit the cloud config ready event

 # this can be used by upstart jobs for 'start on cloud-config'.

 # - emit_upstart

-# - disk_setup

-# - mounts

  - ssh-import-id

 # - set-passwords

  - package-update-upgrade-install

@@ -79,12 +78,18 @@ cloud_final_modules:

 # System and/or distro specific settings

 # (not accessible to handlers/transforms)

 system_info:

+   default_user:

+      name: photon

+      lock_passwd: true

+      gecos: Azure User

+      groups: [wheel, adm, systemd-journal]

+      sudo: ["ALL=(ALL) NOPASSWD:ALL"]

+      shell: /bin/bash

    # This will affect which distro class gets used

    distro: photon

    # Other config here will be given to the distro class and/or path classes

    paths:

       cloud_dir: /var/lib/cloud/

       templates_dir: /etc/cloud/templates/

-      upstart_dir: /etc/init/

    ssh_svcname: ssh