openstack
/
sahara
Code Issues Proposed changes

remove default=None for config options 

In the cfg module default=None is set as the default value.

Change-Id: Icb4c6909987d5a8f137e8e6a511206d13188d8ce
Closes-Bug: #1323975
This commit is contained in:
Christian Berendt 2014-05-28 09:03:46 +02:00
parent c1d6d02ab7
commit a5adecfb5e
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sahara/main.py
View File

@ -65,7 +65,6 @@ opts = [
default='admin',
help='Name of tenant where the user is admin.'),
cfg.StrOpt('os_region_name',
default=None,
help='Region name used to get services endpoints.'),
cfg.StrOpt('infrastructure_engine',
default='direct',

15
sahara/tests/integration/configs/config.py
View File

@ -59,7 +59,6 @@ COMMON_CONFIG_OPTS = [
default='1.1',
help='API version for Sahara.'),
cfg.StrOpt('FLAVOR_ID',
default=None,
help='OpenStack flavor ID for virtual machines. If you leave '
'the default value of this parameter, then flavor ID will '
'be created automatically, using nova client. The created '
@ -110,7 +109,6 @@ COMMON_CONFIG_OPTS = [
'and/or digits)) for its uniqueness. In the end of tests '
'key pair will be deleted.'),
cfg.StrOpt('PATH_TO_SSH_KEY',
default=None,
help='Path to id_rsa key which is used with tests for remote '
'command execution. If you specify wrong path to key '
'then you will have the error "Private key file is '
@ -119,7 +117,6 @@ COMMON_CONFIG_OPTS = [
'(private and public SSH keys) will be generated '
'automatically, using nova client.'),
cfg.StrOpt('FLOATING_IP_POOL',
default=None,
help='Pool name for floating IPs. If Sahara uses Nova '
'management network and auto assignment of IPs was '
'enabled then you should leave default value of this '
@ -154,28 +151,24 @@ VANILLA_CONFIG_OPTS = [
default='vanilla',
help='Name of plugin.'),
cfg.StrOpt('IMAGE_ID',
default=None,
help='ID for image which is used for cluster creation. Also '
'you can specify image name or tag of image instead of '
'image ID. If you do not specify image related parameters '
'then image for cluster creation will be chosen by '
'tag "sahara_i_tests".'),
cfg.StrOpt('IMAGE_NAME',
default=None,
help='Name for image which is used for cluster creation. Also '
'you can specify image ID or tag of image instead of '
'image name. If you do not specify image related '
'parameters, then the image for cluster creation will be '
'chosen by tag "sahara_i_tests".'),
cfg.StrOpt('IMAGE_TAG',
default=None,
help='Tag for image which is used for cluster creation. Also '
'you can specify image ID or image name instead of tag of '
'image. If you do not specify image related parameters, '
'then image for cluster creation will be chosen by '
'tag "sahara_i_tests".'),
cfg.StrOpt('SSH_USERNAME',
default=None,
help='Username to get cluster node with SSH.'),
cfg.StrOpt('HADOOP_VERSION',
default='1.2.1',
@ -235,28 +228,24 @@ VANILLA_TWO_CONFIG_OPTS = [
default='vanilla',
help='Name of plugin.'),
cfg.StrOpt('IMAGE_ID',
default=None,
help='ID for image which is used for cluster creation. Also '
'you can specify image name or tag of image instead of '
'image ID. If you do not specify image related parameters '
'then image for cluster creation will be chosen by '
'tag "savanna_i_tests".'),
cfg.StrOpt('IMAGE_NAME',
default=None,
help='Name for image which is used for cluster creation. Also '
'you can specify image ID or tag of image instead of '
'image name. If you do not specify image related '
'parameters, then the image for cluster creation will be '
'chosen by tag "savanna_i_tests".'),
cfg.StrOpt('IMAGE_TAG',
default=None,
help='Tag for image which is used for cluster creation. Also '
'you can specify image ID or image name instead of tag of '
'image. If you do not specify image related parameters, '
'then image for cluster creation will be chosen by '
'tag "savanna_i_tests".'),
cfg.StrOpt('SSH_USERNAME',
default=None,
help='Username to get cluster node with SSH.'),
cfg.StrOpt('HADOOP_VERSION',
default='2.3.0',
@ -313,28 +302,24 @@ HDP_CONFIG_OPTS = [
default='hdp',
help='Name of plugin.'),
cfg.StrOpt('IMAGE_ID',
default=None,
help='ID for image which is used for cluster creation. Also '
'you can specify image name or tag of image instead of '
'image ID. If you do not specify image related '
'parameters, then image for cluster creation will be '
'chosen by tag "sahara_i_tests".'),
cfg.StrOpt('IMAGE_NAME',
default=None,
help='Name for image which is used for cluster creation. Also '
'you can specify image ID or tag of image instead of '
'image name. If you do not specify image related '
'parameters, then image for cluster creation will be '
'chosen by tag "sahara_i_tests".'),
cfg.StrOpt('IMAGE_TAG',
default=None,
help='Tag for image which is used for cluster creation. Also '
'you can specify image ID or image name instead of tag of '
'image. If you do not specify image related parameters, '
'then image for cluster creation will be chosen by '
'tag "sahara_i_tests".'),
cfg.StrOpt('SSH_USERNAME',
default=None,
help='Username to get cluster node with SSH.'),
cfg.ListOpt('MASTER_NODE_PROCESSES',
default=['JOBTRACKER', 'NAMENODE', 'SECONDARY_NAMENODE',