Make own CPU allocation for CaaS default CPU pool

[ta/infra-ansible.git] / roles / allocate_cpu_cores / defaults / main.yml

diff --git a/roles/allocate_cpu_cores/defaults/main.yml b/roles/allocate_cpu_cores/defaults/main.yml
index 0a43c76..bd89b92 100644 (file)
--- a/roles/allocate_cpu_cores/defaults/main.yml
+++ b/roles/allocate_cpu_cores/defaults/main.yml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Number of platform CPUs to allocate per service by default.
-cloud_default_platform_cpus:
+platform_cpus:
   default:
     controller:
       own: 1
@@ -24,9 +24,9 @@ cloud_default_platform_cpus:
     compute:
       shared: 1
     caas_master:
-      own: 2
+      shared: 1
     caas_worker:
-      own: 1
+      shared: 1
   single:
     controller:
       own: 1
@@ -34,9 +34,9 @@ cloud_default_platform_cpus:
     compute:
       shared: 1
     caas_master:
-      own: 1
+      shared: 1
     caas_worker:
-      own: 1
+      shared: 1
   virtual:
     controller:
       shared: 2
@@ -45,15 +45,32 @@ cloud_default_platform_cpus:
     compute:
       shared: 1
     caas_master:
-      shared: 2
+      shared: 1
     caas_worker:
       shared: 1
 
+caas_default_pool_cpus:
+  default:
+    caas_master:
+      own: 2
+    caas_worker:
+      own: 1
+  single:
+    caas_master:
+      own: 2
+    caas_worker:
+      own: 1
+  virtual:
+    caas_master:
+      own: 2
+    caas_worker:
+      own: 1
+
 caas_service_profiles:
   - caas_master
   - caas_worker
 
-allocation_fact_file: "/etc/ansible/facts.d/cloud_cpu_allocation.fact"
+allocation_fact_file: "/etc/ansible/facts.d/cpu_allocation.fact"
 
 cpu_set_mapping:
   ovs_dpdk:
@@ -64,3 +81,5 @@ cpu_set_mapping:
     opt: exclusive_pool_percentage
   caas_shared:
     opt: shared_pool_percentage
+
+caas_cpu_pool_share_default: 50