x/packstack
Code Issues Proposed changes

Merge "[core] Executing --allinone now we honor the default values"

Browse Source
This commit is contained in:
Jenkins
2014-03-07 22:10:28 +00:00
committed by Gerrit Code Review
parent 7be74cc09e 85961887f8
commit 7b15ef189b
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packstack/installer/run_setup.py
View File

@@ -641,10 +641,6 @@ def single_step_aio_install(options):
# Also allow the command line to set values for any of these 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 # 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: if not options.novanetwork_pubif:
options.novanetwork_pubif = utils.device_from_ip(options.install_hosts) options.novanetwork_pubif = utils.device_from_ip(options.install_hosts)
if not options.novacompute_privif: 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 # If we are doing an all-in-one install, do demo provisioning
# unless specifically told not to # unless specifically told not to
if not options.provision_demo: if (options.os_neutron_install != "n" and \
options.provision_demo = "y" 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" options.provision_all_in_one_ovs_bridge = "y"
single_step_install(options) single_step_install(options)

4
packstack/plugins/prescript_000.py
View File

@@ -120,7 +120,7 @@ def initConfig(controllerObject):
"PROMPT" : "Should Packstack install OpenStack Object Storage (Swift)", "PROMPT" : "Should Packstack install OpenStack Object Storage (Swift)",
"OPTION_LIST" : ["y", "n"], "OPTION_LIST" : ["y", "n"],
"VALIDATORS" : [validators.validate_options], "VALIDATORS" : [validators.validate_options],
"DEFAULT_VALUE" : "n", "DEFAULT_VALUE" : "y",
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": False, "LOOSE_VALIDATION": False,
"CONF_NAME" : "CONFIG_SWIFT_INSTALL", "CONF_NAME" : "CONFIG_SWIFT_INSTALL",
@@ -179,7 +179,7 @@ def initConfig(controllerObject):
"PROMPT" : "Should Packstack install Nagios to monitor OpenStack hosts", "PROMPT" : "Should Packstack install Nagios to monitor OpenStack hosts",
"OPTION_LIST" : ["y", "n"], "OPTION_LIST" : ["y", "n"],
"VALIDATORS" : [validators.validate_options], "VALIDATORS" : [validators.validate_options],
"DEFAULT_VALUE" : 'n', "DEFAULT_VALUE" : 'y',
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": False, "LOOSE_VALIDATION": False,
"CONF_NAME" : "CONFIG_NAGIOS_INSTALL", "CONF_NAME" : "CONFIG_NAGIOS_INSTALL",

2
packstack/plugins/provision_700.py
View File

@@ -33,7 +33,7 @@ def initConfig(controllerObject):
"PROMPT" : "Would you like to provision for demo usage and testing?", "PROMPT" : "Would you like to provision for demo usage and testing?",
"OPTION_LIST" : ["y", "n"], "OPTION_LIST" : ["y", "n"],
"VALIDATORS" : [validators.validate_options], "VALIDATORS" : [validators.validate_options],
"DEFAULT_VALUE" : "n", "DEFAULT_VALUE" : "y",
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_PROVISION_DEMO", "CONF_NAME" : "CONFIG_PROVISION_DEMO",