[PATCH] BZ#740089: fix wording in interactive installer (rev2)
John Eckersberg
jeckersb at redhat.com
Wed Dec 21 17:56:16 UTC 2011
On Wed, 21 Dec 2011 08:27:18 -0500, Mo Morsi <mmorsi at redhat.com> wrote:
> ---
> recipes/aeolus/cli.rb | 17 ++++++++++-------
> 1 files changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/recipes/aeolus/cli.rb b/recipes/aeolus/cli.rb
> index cd3d0dd..2f43b22 100644
> --- a/recipes/aeolus/cli.rb
> +++ b/recipes/aeolus/cli.rb
> @@ -33,22 +33,25 @@ NODE_YAML='/etc/aeolus-configure/nodes/custom'
> IMAGE_TEMPLATE='/etc/aeolus-configure/custom_template.tdl'
> PROFILE_RECIPE='/usr/share/aeolus-configure/modules/aeolus/manifests/profiles/custom.pp'
>
> +
> installed_component = nil
> install_components = ["- aeolus::conductor"]
> -while ![:None, :All].include?(installed_component)
> +component_options = [:"Select All Components", :"Finish Selection",
> + :"Select Image Factory", :"Select Image Warehouse"]
> +all_option,none_option,imagefactory_option, image_warehouse_option = *component_options
> +while ![none_option, all_option].include?(installed_component)
> clear_screen
> say "Select Aeolus Components to Install"
> installed_component =
> choose do |menu|
> menu.prompt = "Install Aeolus Component: "
> - menu.choice :All
> - menu.choice :None
> - menu.choice :"Image Factory"
> - menu.choice :"Image Warehouse"
> + component_options.each { |op|
> + menu.choice op
> + }
> end
> - if installed_component == :"Image Factory"
> + if installed_component == imagefactory_option
> install_components << "- aeolus::image-factory"
> - elsif installed_component == :"Image Warehouse"
> + elsif installed_component == image_warehouse_option
> install_components << "- aeolus::iwhd"
> elsif installed_component == :All
> install_components << "- aeolus::conductor" <<
> --
> 1.7.6.4
>
ACK
More information about the aeolus-devel
mailing list