From 560548f7f8819b8cfe6c7b29f1ab8524fe9133ce Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Mon, 14 Dec 2015 14:38:26 +0100
Subject: [PATCH] Change instance service default path for private key to None

When setting the default for path_to_private_key to "~/.ssh/id_rsa"
it's impossible to disable private_key usage within a driver section.
So set the default to "None".

Change-Id: I17f6b24fc6581dde2b1784b9cdb7778d251145c1
Closes-Bug: #1522074
(cherry picked from commit 43fbbe61c82ac5101b1694f25b5fdbcfba4807d1)
---
 manila/share/drivers/service_instance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manila/share/drivers/service_instance.py b/manila/share/drivers/service_instance.py
index a39c8a5f27..98297a5359 100644
--- a/manila/share/drivers/service_instance.py
+++ b/manila/share/drivers/service_instance.py
@@ -130,7 +130,7 @@ common_opts = [
         help="Password for service instance user."),
     cfg.StrOpt(
         "path_to_private_key",
-        default="~/.ssh/id_rsa",
+        default=None,
         help="Path to host's private key."),
     cfg.IntOpt(
         "max_time_to_build_instance",