defaults.yaml in forj-1.0.10

- old
+ new

@@ -133,10 +133,11 @@
     :keypair_path:
       :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."
+      :default_value:      "<%= config[:keypair_name] %>"
     :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
@@ -206,10 +207,10 @@
 
   :maestro:
     :tenant_name:
       :desc:            "Tenant name required by fog/openstack on gardener"
       :account:         true
-      :validate:        !ruby/regexp /^\w?[\w_-]*$/
+      :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."