From df7b6c5564e6ef8f5ceae9de8ff79410a4894f5f Mon Sep 17 00:00:00 2001 From: Jay Faulkner Date: Tue, 26 Aug 2014 14:45:08 -0700 Subject: Add failback for older Openstack configdrive versions - Also utilizing the constants defined in cloudinit/sources/helpers/openstack.py for configdrive versions --- cloudinit/sources/DataSourceConfigDrive.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'cloudinit') diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py index 8e65fc46..c55f7d4a 100644 --- a/cloudinit/sources/DataSourceConfigDrive.py +++ b/cloudinit/sources/DataSourceConfigDrive.py @@ -172,10 +172,12 @@ def get_ds_mode(cfgdrv_ver, ds_cfg=None, user=None): return "net" -def read_config_drive(source_dir, version="2013-10-17"): +def read_config_drive(source_dir, version=openstack.OS_HAVANA): reader = openstack.ConfigDriveReader(source_dir) finders = [ (reader.read_v2, [], {'version': version}), + (reader.read_v2, [], {'version': openstack.OS_GRIZZLY}), + (reader.read_v2, [], {'version': openstack.OS_FOLSOM}), (reader.read_v1, [], {}), ] excps = [] -- cgit v1.2.3