diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-27 16:53:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-27 16:53:00 +0000 |
| commit | 0afb127c591f1fc4dac5dd4ff34abe0b7f429527 (patch) | |
| tree | aba0dcd1c4b2fc8dd29630a62057b5af630cf6a9 | |
| parent | de8335ff8f09379cf575123d4a44e15f8d65ce20 (diff) | |
| parent | ea06eff7e7e05826816813af6b4b55cd8f8d8413 (diff) | |
Merge "Remove unused flags"
| -rw-r--r-- | nova/flags.py | 14 | ||||
| -rw-r--r-- | nova/virt/powervm/driver.py | 3 | ||||
| -rw-r--r-- | nova/volume/storwize_svc.py | 2 |
3 files changed, 1 insertions, 18 deletions
diff --git a/nova/flags.py b/nova/flags.py index 08a136963..91dcab9fe 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -149,10 +149,6 @@ global_opts = [ default='$my_ip', help='hostname or ip for openstack to use when accessing ' 'the s3 api'), - cfg.StrOpt('s3_dmz', - default='$my_ip', - help='hostname or ip for the instances to use when accessing ' - 'the s3 api'), cfg.StrOpt('cert_topic', default='cert', help='the topic cert nodes listen on'), @@ -213,10 +209,6 @@ global_opts = [ 'nova.api.openstack.volume.contrib.standard_extensions' ], help='osapi volume extension to load'), - cfg.StrOpt('osapi_scheme', - default='http', - help='the protocol to use when connecting to the openstack api ' - 'server (http, https)'), cfg.StrOpt('osapi_path', default='/v1.1/', help='the path prefix used to call the openstack api server'), @@ -238,9 +230,6 @@ global_opts = [ cfg.IntOpt('metadata_port', default=8775, help='the port for the metadata api port'), - cfg.StrOpt('default_project', - default='openstack', - help='the default project to use for openstack'), cfg.StrOpt('default_image', default='ami-11111', help='default image to use, testing only'), @@ -257,9 +246,6 @@ global_opts = [ cfg.StrOpt('vpn_key_suffix', default='-vpn', help='Suffix to add to project name for vpn key and secgroups'), - cfg.IntOpt('auth_token_ttl', - default=3600, - help='Seconds for auth tokens to linger'), cfg.StrOpt('sqlite_db', default='nova.sqlite', help='the filename to use with sqlite'), diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py index a45b10b3f..577000828 100644 --- a/nova/virt/powervm/driver.py +++ b/nova/virt/powervm/driver.py @@ -37,9 +37,6 @@ powervm_opts = [ cfg.StrOpt('powervm_mgr', default=None, help='PowerVM manager host or ip'), - cfg.StrOpt('powervm_vios', - default='powervm_mgr', - help='PowerVM vios host or ip if different from manager'), cfg.StrOpt('powervm_mgr_user', default=None, help='PowerVM manager user name'), diff --git a/nova/volume/storwize_svc.py b/nova/volume/storwize_svc.py index d1958a702..dc3ed309d 100644 --- a/nova/volume/storwize_svc.py +++ b/nova/volume/storwize_svc.py @@ -79,7 +79,7 @@ storwize_svc_opts = [ help='Storage system compression option for volumes'), cfg.StrOpt('storwize_svc_flashcopy_timeout', default='120', - help='Maximum number of seconds to wait for FlashCopy to be' + help='Maximum number of seconds to wait for FlashCopy to be ' 'prepared. Maximum value is 600 seconds (10 minutes).'), ] |