X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fconfig-manager.git;a=blobdiff_plain;f=userconfigtemplate%2Fuser_config.yaml;h=fdf6bdee14ca0de23a31169d5d4f58dbdcccd8c6;hp=6f8ce3a140c8d13b94b13c5af3a9953bd63b9e04;hb=refs%2Fheads%2Fmaster;hpb=04ffd0a9c00d4b58fb5e82825a4c7cdec5b42467

diff --git a/userconfigtemplate/user_config.yaml b/userconfigtemplate/user_config.yaml
index 6f8ce3a..fdf6bde 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.2
+version: 2.0.5
 
 ### 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>
@@ -169,6 +172,38 @@ networking:
                 #routes:
                 #    - {to: 192.168.12.0/22, via: 192.168.12.65}
 
+    ### Optional.
+    ### This network is used as the underlay network for inter-cluster
+    ### communication within CaaS. Setting this network can expose CaaS cluster
+    ### services to this network.
+    ### If unspecified, infra_internal used as a fallback option.
+    #caas_oam:
+        ### Optional network mtu
+        ### If not defined default value is used.
+        #mtu: <VALUE>
+
+        ### Network domains
+        #network_domains:
+            ### User defined name for network domain
+            #rack-1:
+                ### Network address in CIDR format
+                #cidr: <VALUE>
+
+                ### Optional vlan id
+                #vlan: <VALUE>
+
+                ### IP address of the gateway for default route.
+                ### If unspecified, the subnet's first IP address assumed.
+                #gateway: <VALUE>
+
+                ### Range for IPs
+                #ip_range_start: <VALUE>
+                #ip_range_end: <VALUE>
+
+                ### Optional static routes
+                #routes:
+                #    - {to: <CIDR>, via: <IP>}
+
     ### Provider networks
     ### Provider network to physical interface mapping is done
     ### in the network profile configuration
@@ -232,6 +267,12 @@ caas:
     ### the Docker bridge CIDRs of all host via this parameter.
     #docker0_cidr: "172.17.0.1/16"
 
+    ### This parameter is used to set the overlay CIDR of the default network for containers, so pods can comminucate
+    ### over this subnet and Kubernetes services are available here also.
+    ### The parameter can be used to make sure the CIDR of this network does not overlap with any customer
+    ### specific provider network's
+    #oam_cidr: "10.244.0.0/16"
+
     ### Mandatory parameter. All the infrastructure's HTTP servers are secured with TLS.
     ### The certificates of the servers are created in infrastructure deployment time, and are signed by an externally provided CA certificate.
     ### This CA certificate can be configured by setting its encrypted format into this configuration parameter.
@@ -254,6 +295,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:
@@ -418,6 +466,11 @@ performance_profiles:
             #numa0: <COUNT>
             #numa1: <COUNT>
 
+        ### Optional. Performance tuning.
+        ### Valid values are low_latency and standard (default).
+        ### Note that low_latency mode will turn off power saving, etc
+        #tuning: <low_latency|standard>
+
         ### Optional. Create CPU pools in CaaS CPU manager.
         ### Type of this parameter is dictionary, consisting of the following attributes:
         ### - exclusive_pool_percentage
@@ -562,7 +615,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>, ...]