Use default CPU allocation for default CPU pool

Change-Id: Ibc2b02f70c932ac0d3739ee15b4f7e5045154441
Depends-On:  I443e8df96b27d9734ae01f5638ec2360987c9803
Signed-off-by: Krisztian Lengyel <krisztian.lengyel@nokia.com>

diff --git a/ansible/roles/docker/defaults/main.yaml b/ansible/roles/docker/defaults/main.yaml
deleted file mode 100644 (file)
index 447e9ad..0000000
--- a/ansible/roles/docker/defaults/main.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-# Copyright 2019 Nokia
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-  container_images_fact_file: "/etc/ansible/facts.d/ncir_container_images.fact"

diff --git a/infra-charts/values.yaml.j2 b/infra-charts/values.yaml.j2
index c5da700..51603bd 100644 (file)
--- a/infra-charts/values.yaml.j2
+++ b/infra-charts/values.yaml.j2
@@ -52,7 +52,7 @@ cpupooler:
   webhook_ca_bundle: {{ webhooks_ca }}
   webhook_port: {{ caas.webhook_port }}
   cpu_poolconfigs:
-    {{ ansible_local['ncir_cpu_pooler_config'] | default([]) | to_nice_yaml | indent(4) }}
+    {{ ansible_local['cpu_pooler_config'] | default([]) | to_nice_yaml | indent(4) }}
 
 elasticsearch:
   required: true