forj/defaults.yaml in forj-1.0.5 vs forj/defaults.yaml in forj-1.0.6

- old
+ new

@@ -28,14 +28,10 @@ # Ports to open for Maestro, added to the security group :security_group: forj :ports: [22, 80, 443, 3000, 3131-3135, 4505-4506, 5000, 5666, 8000, 8080-8081, 8083, 8125, 8139-8140, 8773-8776, 9292, 29418, 35357] - # Private key file path. Those files (private/public key) will be added to ~/.forj/keypairs/ as respectively 'keypair_name' and 'keypair_name'.pub - :keypair_files: ~/.ssh/forj-id_rsa - :keypair_name: forj - # Network: If network doesn't exist, forj cli will try to create it, and attach it a router. :network: forj # Users: Default user for ssh connection, if user doesn't exits, forj cli will try to get the user from the server image on it's name attribute :users: ['ubuntu', 'fedora', 'cloud-user', 'cirros', 'centos', 'cloud', 'root'] @@ -125,21 +121,21 @@ The public key is used to configure your server to authorize you to access the box with your private key. This keypair files will be copied to '$HOME/.forj/keypairs/ under <keypair_name> files for 'forj' needs. If the keypair doesn't exist locally, it will be created for you. :desc: "Base keypair file name" - :default_value: "~/.ssh/id_rsa-forj" + :default_value: "~/.ssh/<%= config[:keypair_name] %>-id_rsa" :validate_function: :forj_check_keypairs_files :account: true :ask_step: 2 :after: :keypair_name :post_step_function: :forj_setup_keypairs_files :keypair_path: :desc: "Forj internal copy of private and public key pair files " :keypair_name: :desc: "keypair name defined in your cloud to access your server. By default we named it 'forj'. If it doesn't exist, it will be created." - :validate: !ruby/regexp /^\w?\w*$/ + :required: true :default_value: "forj" :account: true :ask_step: 2 :auth_uri: :desc: "Generic service auth url" @@ -155,12 +151,13 @@ :account_key: :desc: "Generic cloud account key" :account_exclusive: true :account: true :required: true + :encrypted: true :tenant: - :desc: "Openstack Tenant ID" + :desc: "Openstack Tenant Name (Project name)" :account_exclusive: true :account: true :required: true :ask_step: 0 :os_user: @@ -168,17 +165,19 @@ :account_exclusive: true :account: true :required: true :validate: !ruby/regexp /\w+/ :ask_step: 1 + :default_value: "<%= (config[:provider_name] == 'openstack')?config[:account_id]:nil %>" :os_enckey: :desc: "Openstack compute cloud password" :account_exclusive: true :encrypted: true :account: true :required: true :ask_step: 1 + :default_value: "<%= (config[:provider_name] == 'openstack')?config[:account_key]:nil %>" # Defines DNS services for maestro :dns: :domain_name: :desc: "Domain name added to each hosts." @@ -204,15 +203,16 @@ :desc: "Tenant name required by fog/openstack on gardener" :account: true :validate: !ruby/regexp /^\w?[\w_-]*$/ :ask_step: 1 :ask_sort: 0 + :default_value: "<%= (config[:provider_name] == 'openstack')?config[:tenant]:nil %>" :network_name: :desc: "Network name to attach to each forge boxes. By default we use 'forj'. If it doesn't exist, it will be created." :default: network :account: true - :validate: !ruby/regexp /^\w?\w*$/ + :required: true :default_value: "forj" :ask_step: 2 :security_group: :desc: "Security group name to configure and attach to each forge boxes." :account: true @@ -226,30 +226,37 @@ :box_name: :desc: "forj cli use 'build.sh' to create Maestro. See box_name option on build.sh to get more information. By default 'maestro'" :build_config: :desc: "forj cli use 'build.sh' to create Maestro. See build_config option on build.sh to get more information. By default 'box'" :bp_flavor: - :desc: "Blueprint nodes default flavor. Usually, blueprint node are smaller than Maestro." + :desc: "Blueprint nodes default flavor" + :explanation: |- + Blueprint usually defines the required flavor for their nodes. If not, it will use this flavor as default. + Usually, blueprint nodes are smaller than Maestro. :account: true :list_values: :query_type: :query_call # Will execute a query on flavor, query_params is empty for all. :object: :flavor :value: :name :validate: :list_strict :ask_step: 2 :flavor_name: - :desc: "Maestro Flavor name. This flavor is for Maestro only. Your blueprint layout defines each node flavors on needs." + :explanation: 'This flavor is for Maestro only.' + :desc: "Maestro Flavor name" :default: :flavor :account: true :list_values: :query_type: :query_call # Will execute a query on flavor, query_params is empty for all. :object: :flavor :value: :name :validate: :list_strict :ask_step: 2 :image_name: - :desc: "Ubuntu image used to create Maestro and all forge boxes. By default, it is 'Ubuntu Precise 12.04.4 LTS Server 64-bit 20140414 (Rescue Image)'" + :desc: "Image name" + :explanation: |- + Ubuntu image used to create Maestro and all forge boxes. Originally, Maestro uses 'Ubuntu Precise 12.04.4 LTS Server 64-bit'. + You need to choose the appropriate image to make Maestro & boxes to boot normally. :account: true :ask_step: 2 :list_values: :query_type: :query_call # Will execute a query on flavor, query_params is empty for all. No filter currently working. :object: :image @@ -265,16 +272,15 @@ If this name is incoherent with the image you choosed, please update it. Checking image '<%= config[:image_name] %>'... :account: true :ask_step: 2 + :after: :image_name :list_values: - :query_type: :process_call # Will execute a query on image and return the list of images. - :query_call: :setup_ssh_user - :query_params: - :image_name: lorj::config[:image_name] - :object: :image - :value: :name + :query_type: :process_call # Will execute a process to query on image + :query_call: :setup_ssh_user # and return the list of images and a default value. + :query_params: # Transmitted as hParams + :image_name: '<%= config[:image_name] %>' :ports: :desc: "List of security group rules (1 port or range of ports) to open to the external network." :branch: :desc: "Branch to use to build your forge" :bootstrap_dirs: