[core] Executing --allinone now we honor the default values
Fix bz#1056689 Change-Id: Iff87fc1e860ded66ae041f4f756fe1dae5cf0203
This commit is contained in:
parent
d911c67191
commit
85961887f8
|
@ -641,10 +641,6 @@ def single_step_aio_install(options):
|
|||
|
||||
# Also allow the command line to set values for any of these options
|
||||
# by testing if they have been set before we set them here
|
||||
if not options.os_swift_install:
|
||||
options.os_swift_install = "y"
|
||||
if not options.nagios_install:
|
||||
options.nagios_install = "y"
|
||||
if not options.novanetwork_pubif:
|
||||
options.novanetwork_pubif = utils.device_from_ip(options.install_hosts)
|
||||
if not options.novacompute_privif:
|
||||
|
@ -654,10 +650,8 @@ def single_step_aio_install(options):
|
|||
|
||||
# If we are doing an all-in-one install, do demo provisioning
|
||||
# unless specifically told not to
|
||||
if not options.provision_demo:
|
||||
options.provision_demo = "y"
|
||||
if options.os_neutron_install != "n" and \
|
||||
not options.provision_all_in_one_ovs_bridge:
|
||||
if (options.os_neutron_install != "n" and \
|
||||
not options.provision_all_in_one_ovs_bridge):
|
||||
options.provision_all_in_one_ovs_bridge = "y"
|
||||
|
||||
single_step_install(options)
|
||||
|
|
|
@ -120,7 +120,7 @@ def initConfig(controllerObject):
|
|||
"PROMPT" : "Should Packstack install OpenStack Object Storage (Swift)",
|
||||
"OPTION_LIST" : ["y", "n"],
|
||||
"VALIDATORS" : [validators.validate_options],
|
||||
"DEFAULT_VALUE" : "n",
|
||||
"DEFAULT_VALUE" : "y",
|
||||
"MASK_INPUT" : False,
|
||||
"LOOSE_VALIDATION": False,
|
||||
"CONF_NAME" : "CONFIG_SWIFT_INSTALL",
|
||||
|
@ -179,7 +179,7 @@ def initConfig(controllerObject):
|
|||
"PROMPT" : "Should Packstack install Nagios to monitor OpenStack hosts",
|
||||
"OPTION_LIST" : ["y", "n"],
|
||||
"VALIDATORS" : [validators.validate_options],
|
||||
"DEFAULT_VALUE" : 'n',
|
||||
"DEFAULT_VALUE" : 'y',
|
||||
"MASK_INPUT" : False,
|
||||
"LOOSE_VALIDATION": False,
|
||||
"CONF_NAME" : "CONFIG_NAGIOS_INSTALL",
|
||||
|
|
|
@ -33,7 +33,7 @@ def initConfig(controllerObject):
|
|||
"PROMPT" : "Would you like to provision for demo usage and testing?",
|
||||
"OPTION_LIST" : ["y", "n"],
|
||||
"VALIDATORS" : [validators.validate_options],
|
||||
"DEFAULT_VALUE" : "n",
|
||||
"DEFAULT_VALUE" : "y",
|
||||
"MASK_INPUT" : False,
|
||||
"LOOSE_VALIDATION": True,
|
||||
"CONF_NAME" : "CONFIG_PROVISION_DEMO",
|
||||
|
|
Loading…
Reference in New Issue