From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Thu, 1 Feb 2018 16:27:19 +0000 (+0100)
Subject: [fuel] Allow MaaS timeout config via IDF
X-Git-Tag: 6.0.0~2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=829afd4707972c7ce795fa402577a64d3254f676;p=pharos.git

[fuel] Allow MaaS timeout config via IDF

MaaS timeouts should be configurable on per-POD basis, since nodes
in some labs take longer to comission/deploy than our default values.

IDF SCHEMA:
- add new properties to Fuel IDF section;

Change-Id: Ife5ff85faeae683a8c1781cae8b29f09c1f07b82
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/config/pdf/idf-pod1.schema.yaml b/config/pdf/idf-pod1.schema.yaml
index ad680da5..0705fcc5 100644
--- a/config/pdf/idf-pod1.schema.yaml
+++ b/config/pdf/idf-pod1.schema.yaml
@@ -44,6 +44,15 @@ definitions:
               additionalProperties: false
           required: ['bridges']
           additionalProperties: false
+        maas:
+          type: 'object'
+          properties:
+            timeout_comissioning:
+              type: 'number'
+            timeout_deploying:
+              type: 'number'
+          required: ['timeout_comissioning', 'timeout_deploying']
+          additionalProperties: false
         network:
           type: 'object'
           properties:
diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml
index 4e33135b..2d754e5f 100644
--- a/labs/arm/idf-pod5.yaml
+++ b/labs/arm/idf-pod5.yaml
@@ -53,6 +53,10 @@ idf:
         mgmt: 'mgmt7_br0'
         private: ~
         public: 'public7_br0'
+    maas:
+      # MaaS timeouts (in minutes)
+      timeout_comissioning: 10
+      timeout_deploying: 15
     network:
       node:
         # Ordered-list, index should be in sync with node index in PDF
diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml
index 9246c4f7..80e49d1f 100644
--- a/labs/arm/idf-pod6.yaml
+++ b/labs/arm/idf-pod6.yaml
@@ -50,6 +50,10 @@ idf:
         mgmt: 'mgmt14_br0'
         private: ~
         public: 'public14_br0'
+    maas:
+      # MaaS timeouts (in minutes)
+      timeout_comissioning: 10
+      timeout_deploying: 15
     network:
       node:
         # Ordered-list, index should be in sync with node index in PDF
diff --git a/labs/arm/idf-pod7.yaml b/labs/arm/idf-pod7.yaml
index 2c2a9466..175437f5 100644
--- a/labs/arm/idf-pod7.yaml
+++ b/labs/arm/idf-pod7.yaml
@@ -53,6 +53,10 @@ idf:
         mgmt: 'mgmt15_br0'
         private: ~
         public: 'public15_br0'
+    maas:
+      # MaaS timeouts (in minutes)
+      timeout_comissioning: 10
+      timeout_deploying: 15
     network:
       node:
         # Ordered-list, index should be in sync with node index in PDF