From 00006260d2f0d34cc2f090f4bfda32643c709b62 Mon Sep 17 00:00:00 2001
From: Silvan Kaiser <silvan@quobyte.com>
Date: Fri, 24 Mar 2017 11:23:05 +0100
Subject: [PATCH] Reverts quobyte_volume_url option back to type StrOpt

This partially reverts Change Icd39c16ea4ec83749f61a443cd450c76be1aabce,
who changed the type of the option quobyte_volume_url from StrOpt to
UriOpt. This broke the capability to specify redundancy in this option
entry.
This change changes the type back to StrOpt, updates the options
description to reflect possible redundancy, bumps the driver version
and adds a bugfix releasenote.
This change is filed with dependency on another small Bugfix in the
same driver, in order to prevent too many version bump merge conflicts.
Adding DocImpact tag because of the updated option desc.

DocImpact

Closes-Bug: 1675710

Change-Id: I639fb4cd702c074420087af06b111bf9fdaf27d3
---
 cinder/volume/drivers/quobyte.py                         | 9 +++++----
 .../notes/redundancy-in-volume-url-4282087232e6e6f1.yaml | 5 +++++
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/redundancy-in-volume-url-4282087232e6e6f1.yaml

diff --git a/cinder/volume/drivers/quobyte.py b/cinder/volume/drivers/quobyte.py
index c6c23d1e9de..80891f9a65c 100644
--- a/cinder/volume/drivers/quobyte.py
+++ b/cinder/volume/drivers/quobyte.py
@@ -31,14 +31,14 @@ from cinder import interface
 from cinder import utils
 from cinder.volume.drivers import remotefs as remotefs_drv
 
-VERSION = '1.1.3'
+VERSION = '1.1.4'
 
 LOG = logging.getLogger(__name__)
 
 volume_opts = [
-    cfg.URIOpt('quobyte_volume_url',
-               help=('URL to the Quobyte volume e.g.,'
-                     ' quobyte://<DIR host>/<volume name>')),
+    cfg.StrOpt('quobyte_volume_url',
+               help=('Quobyte URL to the Quobyte volume e.g.,'
+                     ' quobyte://<DIR host1>, <DIR host2>/<volume name>')),
     cfg.StrOpt('quobyte_client_cfg',
                help=('Path to a Quobyte Client configuration file.')),
     cfg.BoolOpt('quobyte_sparsed_volumes',
@@ -83,6 +83,7 @@ class QuobyteDriver(remotefs_drv.RemoteFSSnapDriverDistributed):
         1.1.1 - Removes getfattr calls from driver
         1.1.2 - Fixes a bug in the creation of cloned volumes
         1.1.3 - Explicitely mounts Quobyte volumes w/o xattrs
+        1.1.4 - Fixes capability to configure redundancy in quobyte_volume_url
 
     """
 
diff --git a/releasenotes/notes/redundancy-in-volume-url-4282087232e6e6f1.yaml b/releasenotes/notes/redundancy-in-volume-url-4282087232e6e6f1.yaml
new file mode 100644
index 00000000000..f8c4e3e1079
--- /dev/null
+++ b/releasenotes/notes/redundancy-in-volume-url-4282087232e6e6f1.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes a bug that prevented the configuration of multiple redundant
+    Quobyte registries in the quobyte_volume_url config option.