Merge "[baremetal] Containerize MaaS"

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
index 452f7f9..f62caa2 100644 (file)
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
@@ -33,6 +33,10 @@ parameters:
     master:
       accept_policy: open_mode
       file_recv: true
+    minion:
+      mine:
+        module:
+          x509.get_pem_entries: ['/etc/pki/all_cas/*']
   reclass:
     storage:
       data_source:

diff --git a/mcp/scripts/docker-compose/files/opnfv_master.conf b/mcp/scripts/docker-compose/files/opnfv_master.conf
index 0be7d6c..8e6d1af 100644 (file)
--- a/mcp/scripts/docker-compose/files/opnfv_master.conf
+++ b/mcp/scripts/docker-compose/files/opnfv_master.conf
@@ -1,5 +1,6 @@
 worker_threads: 20
-timeout: 10
+timeout: 15
+gather_job_timeout: 30
 max_open_files: 15000
 
 file_roots: