X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=userconfigtemplate%2Fuser_config.yaml;h=de9e18d895447dabc2498944670c13a5e75a53e5;hb=7c3295e9783a677bf15287bf048240c56b3b03ba;hp=e75ea7cac20ea36859ff08be6edbd87aea7900e6;hpb=064ff06a8f5921e6f1b1c6a84b8a4e69837d2c11;p=ta%2Fconfig-manager.git

diff --git a/userconfigtemplate/user_config.yaml b/userconfigtemplate/user_config.yaml
index e75ea7c..de9e18d 100644
--- a/userconfigtemplate/user_config.yaml
+++ b/userconfigtemplate/user_config.yaml
@@ -29,7 +29,7 @@
 ###        - Minor changes in template (e.g. new optional attributes or
 ###          changes in possible values, value ranges or default values)
 ###        - Backwards compatible
-version: 2.0.1
+version: 2.0.4
 
 ### Cloud name can consist of lower case letters, digits and dash (-).
 ### Name must start and end with a letter or a digit.
@@ -62,6 +62,9 @@ users:
     ### python -c "from passlib.hash import sha512_crypt; import getpass; print sha512_crypt.using(rounds=5000).hash(getpass.getpass())"
     admin_user_password: <VALUE>
 
+    # Authorized public keys for the admin user
+    #admin_user_authorized_keys: []
+
     ### User details for the initial user (gets user_management_admin role)
     initial_user_name: <VALUE>
     initial_user_password: <VALUE>
@@ -254,6 +257,13 @@ caas:
     ### The default value is: rec.io
     #dns_domain: "<VALUE>"
 
+    ### Tenant networks.
+    ### This list contains all provider networks dedicated to be used by CaaS tenant users.
+    ### These provider networks needs to binded homogenously to all CaaS hosts and the
+    ### provider network type must be caas.
+    ### SR-IOV provider networks also supported.
+    #tenant_networks: ["tenant_net1", "tenant_net2"]
+
 ### Storage configuration
 storage:
     #backends:
@@ -316,6 +326,15 @@ network_profiles:
             ### Provider network physical interface.
             ### Either Ethernet or bonding interface.
             #<interface_name1>:
+                ### Optional provider network type.
+                ###
+                ### Supported types:
+                ###   caas:
+                ###      Containers as a Service (CaaS) provider network
+                ### Notes:
+                ### CaaS bond interfaces are configured as a Linux bond interfaces.
+                #type: <caas>
+
                 ### Provider networks on this interface.
                 ### Provider networks must be defined also in the networking:
                 ### provider_networks: configuration.
@@ -355,6 +374,11 @@ network_profiles:
                 ### details.
                 ### Default: false
                 #trusted: [true|false]
+
+                ### Optional provider network type
+                ### - caas: configure as CaaS SR-IOV cluster network
+                ### Default: caas
+                #type: <caas>
             ### Use above structure for all the SR-IOV provider networks in
             ### this profile
             #<provider_network_name2>
@@ -548,7 +572,10 @@ hosts:
             address: <VALUE>
             user: <VALUE>
             password: <VALUE>
-
+            # Optional: the IPMI privilege level to request.
+            # Typical values include 'USER', 'OPERATOR', 'ADMINISTRATOR'
+            # default is 'ADMINISTRATOR' if unspecified.
+            # priv_level: <VALUE>
         ### Optional parameter needed for virtual deployment to identify the
         ### nodes the mac address for the provisioning interface
         #mgmt_mac: [<VALUE1>, <VALUE2>, ...]