summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-01 17:27:19 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-01 17:58:25 +0100
commit829afd4707972c7ce795fa402577a64d3254f676 (patch)
tree4dba3fda3522d969bfa3bfe281a3fadb110e2578
parent60238ca0d5e3a7dfc2f60230b1dbab702e4bba73 (diff)
[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>
-rw-r--r--config/pdf/idf-pod1.schema.yaml9
-rw-r--r--labs/arm/idf-pod5.yaml4
-rw-r--r--labs/arm/idf-pod6.yaml4
-rw-r--r--labs/arm/idf-pod7.yaml4
4 files changed, 21 insertions, 0 deletions
diff --git a/config/pdf/idf-pod1.schema.yaml b/config/pdf/idf-pod1.schema.yaml
index ad680da..0705fcc 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 4e33135..2d754e5 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 9246c4f..80e49d1 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 2c2a946..175437f 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