Remove powervm localdisk conf options

This removes the disk_driver and volume_group_name configuration
options from nova-powervm. The options are now located in nova [1].

[1] https://review.openstack.org/#/c/549300/

Change-Id: I73af6218d05de2de4a824d6cb027451d7f4038c9

nova_powervm/conf/powervm.py

@@ -46,11 +46,6 @@ powervm_opts = [
                default='/tmp/cfgdrv/',
                help='The location where the config drive ISO files should be '
                     'built.'),
-    cfg.StrOpt('disk_driver',
-               choices=['localdisk', 'ssp'], ignore_case=True,
-               default='localdisk',
-               help='The disk driver to use for PowerVM disks. '
-               'Valid options are: localdisk, ssp'),
     cfg.StrOpt('volume_adapter',
                choices=['fibre_channel', 'iscsi'], ignore_case=True,
                default='fibre_channel',
@@ -91,15 +86,6 @@ powervm_opts = [
                     "to be up and running.")
 ]
 
-localdisk_opts = [
-    cfg.StrOpt('volume_group_name',
-               default='',
-               help='Volume Group to use for block device operations.  If '
-                    'disk_driver is localdisk, then this attribute must be '
-                    'specified.  It is strongly recommended NOT to use '
-                    'rootvg.'),
-]
-
 ssp_opts = [
     cfg.StrOpt('cluster_name',
                default='',
@@ -212,8 +198,8 @@ vnc_opts = [
                'to use for verifying VNC X509 Authentication.')
 ]
 
-STATIC_OPTIONS = (powervm_opts + localdisk_opts + ssp_opts + vol_adapter_opts
+STATIC_OPTIONS = (powervm_opts + ssp_opts + vol_adapter_opts + npiv_opts
-                  + npiv_opts + remote_restart_opts + swift_opts + vnc_opts)
+                  + remote_restart_opts + swift_opts + vnc_opts)
 
 # Dictionary where the key is the NPIV Fabric Name, and the value is a list of
 # Physical WWPNs that match the key.

nova_powervm/tests/conf/test_conf.py

@@ -133,9 +133,6 @@ class TestConfChoices(test.NoDBTestCase):
                 fx.conf.powervm[option]
 
     def test_choices(self):
-        # Disk driver
-        self._choice_test('bad_driver', ['localdisk', 'ssp'],
-                          cfg.powervm.powervm_opts, 'disk_driver')
         # FC attachment
         self._choice_test('bad_value', ['vscsi', 'npiv'],
                           cfg.powervm.vol_adapter_opts, 'fc_attach_strategy')