From 85961887f8dd6ed382e458b57b6045b316d3e0be Mon Sep 17 00:00:00 2001 From: Francesco Vollero Date: Wed, 22 Jan 2014 18:44:44 +0100 Subject: [PATCH] [core] Executing --allinone now we honor the default values Fix bz#1056689 Change-Id: Iff87fc1e860ded66ae041f4f756fe1dae5cf0203 --- packstack/installer/run_setup.py | 10 ++-------- packstack/plugins/prescript_000.py | 4 ++-- packstack/plugins/provision_700.py | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/packstack/installer/run_setup.py b/packstack/installer/run_setup.py index f93ed5f86..5b10c7f34 100644 --- a/packstack/installer/run_setup.py +++ b/packstack/installer/run_setup.py @@ -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) diff --git a/packstack/plugins/prescript_000.py b/packstack/plugins/prescript_000.py index 0cf6f437e..d491f9c5a 100644 --- a/packstack/plugins/prescript_000.py +++ b/packstack/plugins/prescript_000.py @@ -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", diff --git a/packstack/plugins/provision_700.py b/packstack/plugins/provision_700.py index 7673b9c54..f2c719c1a 100644 --- a/packstack/plugins/provision_700.py +++ b/packstack/plugins/provision_700.py @@ -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",