From 7fcca079ff63f1a1b6d4d3067508883f01515add Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean_mcginnis@dell.com>
Date: Thu, 29 Sep 2016 13:28:29 -0500
Subject: [PATCH] Disable API v1 by default

The v1 API has been deprecated by default since Juno. While we've
determined we can't get rid of it in the foreseeable future, we
shouldn't enable it by default. This may encourage any remaining
users to migrate.

This will also get rid of some warning messages in the logs on
startup warning of the deprecated API.

Change-Id: Ieea9a6c764eb1b55ad399a96e218d773ad4c59a5
Partial-bug: #1413102
---
 cinder/common/config.py                                     | 2 +-
 .../notes/default-apiv1-disabled-9f6bb0c67b38e670.yaml      | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/default-apiv1-disabled-9f6bb0c67b38e670.yaml

diff --git a/cinder/common/config.py b/cinder/common/config.py
index f5f18c614df..9ec9a73cdf5 100644
--- a/cinder/common/config.py
+++ b/cinder/common/config.py
@@ -84,7 +84,7 @@ global_opts = [
                     'value (None) is supplied here, the glanceclient default '
                     'value is used.'),
     cfg.BoolOpt('enable_v1_api',
-                default=True,
+                default=False,
                 deprecated_for_removal=True,
                 help="DEPRECATED: Deploy v1 of the Cinder API."),
     cfg.BoolOpt('enable_v2_api',
diff --git a/releasenotes/notes/default-apiv1-disabled-9f6bb0c67b38e670.yaml b/releasenotes/notes/default-apiv1-disabled-9f6bb0c67b38e670.yaml
new file mode 100644
index 00000000000..41d85ad88a2
--- /dev/null
+++ b/releasenotes/notes/default-apiv1-disabled-9f6bb0c67b38e670.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - The v1 API was deprecated in the Juno release and is
+    now defaulted to disabled. In order to still use the
+    v1 API, you must now set ``enable_v1_api`` to ``True``
+    in your cinder.conf file.