lib/defaults.yaml in forj-1.0.0 vs lib/defaults.yaml in forj-1.0.1

@@ -67,10 +67,16 @@
 # those identified by :account_exclusive: true
 :setup:
    :ask_step:
       -  :desc:    "Provider configuration:"
       -  :desc:    "Maestro Cloud compute configuration:"
+         :explanation:        |-
+            Maestro (gardener) is currently configured to access your cloud Compute service with fog openstack.
+            Fog openstack is compatible with hpcloud services
+
+            It requires the openstack project name, user and password.
+
       -  :desc:    "Maestro and blueprint configuration:"
          :add:
             - :keypair_files
       -  :desc:    "DNS Configuration for Maestro:"
 :sections:
@@ -146,22 +152,15 @@
       :desc:               "Generic cloud account key"
       :account_exclusive:  true
       :account:            true
       :required:           true
     :tenant:
-      :explanation:        |-
-
-         Maestro is currently configured to access your cloud Compute service with fog openstack.
-         Fog openstack is compatible with hpcloud services
-
-         It requires the openstack project name to use, user and password.
-
-      :desc:               "Openstack Tenant name"
+      :desc:               "Openstack Tenant ID"
       :account_exclusive:  true
       :account:            true
       :required:           true
-      :ask_step:           1
+      :ask_step:           0
     :os_user:
       :desc:               "Openstack compute cloud User name"
       :account_exclusive:  true
       :account:            true
       :required:           true
@@ -197,9 +196,13 @@
          :ask_step:           3
 
   :maestro:
     :tenant_name:
       :desc:            "Tenant name required by fog/openstack on gardener"
+      :account:         true
+      :validate:        !ruby/regexp /^\w?[\w_-]*$/
+      :ask_step:        1
+      :ask_sort:        0
     :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*$/