From e8a7e81cb9847a56da6a633a139ac0104aaa3ca6 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Fri, 24 Mar 2017 08:06:55 +0000
Subject: [PATCH] Fix config-drive support inline with cloud-init

Proposed changes to cloud-init under the same bug will
introduce behaviour to support a config-drive type concept
for LXD containers at /config-drive.

The current path is broken; switch to this new path to
support offline configuration of cloud instances.

Change-Id: I4996a34f84eb088c408a6454de9281908490a8eb
Closes-Bug: 1673411
(cherry picked from commit 991b2bd550ab967df398dd038d927980489d111e)
---
 .gitreview              | 1 +
 nova/virt/lxd/driver.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitreview b/.gitreview
index d3a07edd..f61e0300 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/nova-lxd.git
+defaultbranch=stable/ocata
diff --git a/nova/virt/lxd/driver.py b/nova/virt/lxd/driver.py
index 4d283337..2b7dc2fa 100644
--- a/nova/virt/lxd/driver.py
+++ b/nova/virt/lxd/driver.py
@@ -412,7 +412,7 @@ class LXDDriver(driver.ComputeDriver):
             profile = self.client.profiles.get(instance.name)
             config_drive = {
                 'configdrive': {
-                    'path': '/var/lib/cloud/data',
+                    'path': '/config-drive',
                     'source': configdrive_path,
                     'type': 'disk',
                 }