forj/defaults.yaml in forj-1.0.7 vs forj/defaults.yaml in forj-1.0.8

@@ -126,18 +126,24 @@
       :default_value:      "~/.ssh/<%= config[:keypair_name] %>-id_rsa"
       :validate_function:  :forj_check_keypairs_files
       :account:            true
       :ask_step:           2
       :after:              :keypair_name
+      :pre_step_function:  :forj_cloud_keypair_coherent?
       :post_step_function: :forj_setup_keypairs_files
     :keypair_path:
-      :desc:               "Forj internal copy of private and public key pair files "
+      :desc:               "Contains the full path to the :keypair_base."
+      :default_value:      "<%= Forj.keypairs_path %>"
+    :keypair_base:
+      :desc:               "Contains the key file base name without .pem/.pub."
     :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."
       :required:           true
       :default_value:      "forj"
       :account:            true
       :ask_step:           2
+      :pre_step_function:  :update_keypair_config
+      :post_step_function: :forj_check_cloud_keypair
     :auth_uri:
       :desc:               "Generic service auth url"
       :account_exclusive:  true
       :account:            true
       :required:           true