X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=userconfigtemplate%2Fuser_config.yaml;h=64677ac722e4555f728cffa06d07d7bd35aa3210;hb=356eca9c3542836abace5f15893bb8d3c7148f2f;hp=1e1e257efd99c433205d63d8fb75a821520a6d87;hpb=6ec88afabb201adbd3e02490b3cac283a6e43842;p=ta%2Fconfig-manager.git

diff --git a/userconfigtemplate/user_config.yaml b/userconfigtemplate/user_config.yaml
index 1e1e257..64677ac 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.0
+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.
@@ -249,11 +249,18 @@ caas:
     encrypted_ca_key: '["<ENCRYPTED_CA_KEY>"]'
 
     ### This parameter defines the DNS domain served by the REC DNS server for example
-    ### in-cluster Kubernetes Services all belongs to this domain DNS queries. 
+    ### in-cluster Kubernetes Services all belongs to this domain DNS queries.
     ### Outside of this domain are either rejected, or forwarded to a configured upstream DNS server (if, any).
     ### 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 +323,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 +371,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>
@@ -385,7 +406,11 @@ performance_profiles:
         ### Host CPU allocations.
         ### Any host CPUs that are not allocated for some specific purpose
         ### here will be automatically assigned by the system:
-        ### - All remaining CPUs are allocated for the host platform.
+        ### - If the node contains 'caas' in its service_profiles remaining
+        ###   CPUs are allocated for CaaS CPU pools. Remainder CaaS CPU CPUs
+        ###   allocated for default container execution.
+        ### - Any CPUs that don't fall into the above categories are allocated
+        ###   for the host platform.
 
         ### Optional. Allocate CPUs for the host platform.
         ### The configured counts determine the number of full CPU cores to
@@ -400,6 +425,18 @@ performance_profiles:
             #numa0: <COUNT>
             #numa1: <COUNT>
 
+        ### Optional. Create CPU pools in CaaS CPU manager.
+        ### Type of this parameter is dictionary, consisting of the following attributes:
+        ### - exclusive_pool_percentage
+        ### - shared_pool_percentage
+        ### Attributes are optional, but at least one of them shall be defined
+        ### if caas_cpu_pools is defined. The sum of values can't exceed 100.
+        ### Minimum allocation is 1 CPU, which means anything greater than 0
+        ### ensures 1 CPU allocation.
+        #caas_cpu_pools:
+            #exclusive_pool_percentage: <VALUE>
+            #shared_pool_percentage: <VALUE>
+
 ### Storage profiles
 storage_profiles:
     ### The storage_profiles section name is part of mandatory configuration.
@@ -472,17 +509,6 @@ storage_profiles:
         ### This parameter contains the name for the created LVM volume.
         #lv_name: <VALUE>
 
-        ### Mandatory
-        ### This parameter contains the directory where to mount
-        ### the backend of this profile.
-        #mount_dir: <VALUE>
-
-        ### Optional
-        ### This parameter contains the mount options used to mount
-        ### the backend. The format must be a valid fstab format.
-        ### By default it is empty.
-        #mount_options: <VALUE>
-
 host_os:
     ### The value of this parameter is used to protect the entire GRUB 2 menu structure of all the infrastructure nodes.
     ### The configured value should be a properly salted PBKDF2 (Password-Based Key Derivation Function 2) hash.
@@ -543,7 +569,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>, ...]