Merge "Switch StrOpt to URIOpt for URL config options"

cinder/backup/drivers/swift.py

@@ -61,9 +61,9 @@ from cinder import interface
 LOG = logging.getLogger(__name__)
 
 swiftbackup_service_opts = [
-    cfg.StrOpt('backup_swift_url',
+    cfg.URIOpt('backup_swift_url',
                help='The URL of the Swift endpoint'),
-    cfg.StrOpt('backup_swift_auth_url',
+    cfg.URIOpt('backup_swift_auth_url',
                help='The URL of the Keystone endpoint'),
     cfg.StrOpt('swift_catalog_info',
                default='object-store:swift:publicURL',

cinder/common/config.py

@@ -192,7 +192,7 @@ global_opts = [
     cfg.StrOpt('os_privileged_user_tenant',
                help='Tenant name associated with the OpenStack privileged '
                     'account.'),
-    cfg.StrOpt('os_privileged_user_auth_url',
+    cfg.URIOpt('os_privileged_user_auth_url',
                help='Auth URL associated with the OpenStack privileged '
                     'account.'),
 ]

cinder/volume/drivers/hpe/hpe_lefthand_iscsi.py

@@ -64,7 +64,7 @@ if hpelefthandclient:
     from hpelefthandclient import exceptions as hpeexceptions
 
 hpelefthand_opts = [
-    cfg.StrOpt('hpelefthand_api_url',
+    cfg.URIOpt('hpelefthand_api_url',
                default=None,
                help="HPE LeftHand WSAPI Server Url like "
                     "https://<LeftHand ip>:8081/lhos",

cinder/volume/drivers/quobyte.py

@@ -35,7 +35,7 @@ VERSION = '1.1'
 LOG = logging.getLogger(__name__)
 
 volume_opts = [
-    cfg.StrOpt('quobyte_volume_url',
+    cfg.URIOpt('quobyte_volume_url',
                help=('URL to the Quobyte volume e.g.,'
                      ' quobyte://<DIR host>/<volume name>')),
     cfg.StrOpt('quobyte_client_cfg',