From 443095f4d4b6feba30c7011b7ab48adb2a40fcf5 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Thu, 16 Mar 2017 11:20:02 -0400
Subject: ConfigDrive: support reading config drive data from /config-drive.

This is thie cloud-init part of a fix to allow nova-lxd to provide
config drive data.  The other part will be done in nova-lxd.

The agreement here is that nova-lxd will copy the contents of the
config drive to /config-drive in the container.

LP: #1673411
---
 cloudinit/sources/DataSourceConfigDrive.py | 13 ++++++++-----
 tools/ds-identify                          | 13 +++++++++++++
 2 files changed, 21 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:
diff --git a/tools/ds-identify b/tools/ds-identify
index b3220c1f..bf09a3ad 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -538,6 +538,19 @@ check_configdrive_v2() {
     if has_fs_with_label "config-2"; then
         return ${DS_FOUND}
     fi
+    # look in /config-drive <vlc>/seed/config_drive for a directory
+    # openstack/YYYY-MM-DD format with a file meta_data.json
+    local d=""
+    for d in /config-drive "${PATH_VAR_LIB_CLOUD}/seed/config_drive"; do
+        set +f; set -- "$d/openstack/"2???-??-??/meta_data.json; set -f;
+        [ -f "$1" ] && return ${DS_FOUND}
+    done
+    # at least one cloud (softlayer) seeds config drive with only 'latest'.
+    local lpath="openstack/latest/meta_data.json"
+    if [ -e "${PATH_VAR_LIB_CLOUD}/$lpath" ]; then
+        debug 1 "config drive seeded directory had only 'latest'"
+        return ${DS_FOUND}
+    fi
     return ${DS_NOT_FOUND}
 }
 
-- 
cgit v1.2.3