diff options
| author | Scott Moser <smoser@brickies.net> | 2017-04-03 11:52:06 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-04-03 11:52:06 -0400 |
| commit | 3b2e493b51153cd5bc1fa91e6ac52f59d41fe3fb (patch) | |
| tree | 678b118605245e5bb1b218565728270702aba5b4 /cloudinit/sources/DataSourceConfigDrive.py | |
| parent | e018fa910fdf0dbf3aa22e59e935461babd205c4 (diff) | |
| parent | 61eb03fef92f435434d974fb46439189ef0b5f97 (diff) | |
| download | vyos-cloud-init-3b2e493b51153cd5bc1fa91e6ac52f59d41fe3fb.tar.gz vyos-cloud-init-3b2e493b51153cd5bc1fa91e6ac52f59d41fe3fb.zip | |
merge from master at 0.7.9-90-g61eb03fe
Diffstat (limited to 'cloudinit/sources/DataSourceConfigDrive.py')
| -rw-r--r-- | cloudinit/sources/DataSourceConfigDrive.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py index 8a448dc9..46dd89e0 100644 --- a/cloudinit/sources/DataSourceConfigDrive.py +++ b/cloudinit/sources/DataSourceConfigDrive.py @@ -54,13 +54,16 @@ class DataSourceConfigDrive(openstack.SourceMixin, sources.DataSource): found = None md = {} results = {} - if os.path.isdir(self.seed_dir): + for sdir in (self.seed_dir, "/config-drive"): + if not os.path.isdir(sdir): + continue try: - results = read_config_drive(self.seed_dir) - found = self.seed_dir + results = read_config_drive(sdir) + found = sdir + break except openstack.NonReadable: - util.logexc(LOG, "Failed reading config drive from %s", - self.seed_dir) + util.logexc(LOG, "Failed reading config drive from %s", sdir) + if not found: for dev in find_candidate_devs(): try: |