cloud-init-dev team mailing list archive

[James Page <james.page@xxxxxxxxxx>]

Review: Needs Fixing



Diff comments:

> diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py
> index 8a448dc..f247b9c 100644
> --- a/cloudinit/sources/DataSourceConfigDrive.py
> +++ b/cloudinit/sources/DataSourceConfigDrive.py
> @@ -54,13 +54,15 @@ class DataSourceConfigDrive(openstack.SourceMixin, sources.DataSource):
>          found = None
>          md = {}
>          results = {}
> -        if os.path.isdir(self.seed_dir):
> -            try:
> -                results = read_config_drive(self.seed_dir)
> -                found = self.seed_dir
> -            except openstack.NonReadable:
> -                util.logexc(LOG, "Failed reading config drive from %s",
> -                            self.seed_dir)
> +        for sdir in (self.seed_dir, "/config-drive"):
> +            if os.path.isdir(self.seed_dir):

self.seed_dir -> sdir

> +                try:
> +                    results = read_config_drive(self.seed_dir)

self.seed_dir -> sdir

> +                    found = self.seed_dir

ditto above

> +                    break
> +                except openstack.NonReadable:
> +                    util.logexc(LOG, "Failed reading config drive from %s",
> +                                self.seed_dir)

ditto above

>          if not found:
>              for dev in find_candidate_devs():
>                  try:


-- 
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/320069
Your team cloud init development team is requested to review the proposed merge of ~smoser/cloud-init:bug/1673411-nova-lxd-config-drive into cloud-init:master.