From 31f403bbccbb86c7d12be2615fed2879f48ca8cc Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Wed, 20 Mar 2019 09:14:40 -0500
Subject: [PATCH] OSH: Add/Update Armada timeouts, update config overrides

This adds the test timeout field to all charts with helm tests
defined in the OSH Armada manifest, and also updates the release
timeouts for releases known to take longer than usual

This also updates chart overrides to achieve parity between the
standard multinode job and the Armada periodic jobs to reduce the
potential for issues arising from configuration deltas

Change-Id: Id9ba223fbd35ee213db346bbc230a844632e15d2
---
 .../armada/manifests/armada-osh.yaml           | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tools/deployment/armada/manifests/armada-osh.yaml b/tools/deployment/armada/manifests/armada-osh.yaml
index 0b1df33545..ce782e51e4 100644
--- a/tools/deployment/armada/manifests/armada-osh.yaml
+++ b/tools/deployment/armada/manifests/armada-osh.yaml
@@ -210,6 +210,7 @@ data:
       release_group: osh-rabbitmq
   test:
     enabled: true
+    timeout: 600
   install:
     no_hooks: False
   upgrade:
@@ -263,6 +264,7 @@ data:
       release_group: osh-keystone
   test:
     enabled: true
+    timeout: 600
   install:
     no_hooks: False
   upgrade:
@@ -399,7 +401,8 @@ data:
     labels:
       release_group: osh-radosgw-openstack
   test:
-    enabled: false
+    enabled: true
+    timeout: 600
   install:
     no_hooks: False
   upgrade:
@@ -467,6 +470,7 @@ data:
       release_group: osh-glance
   test:
     enabled: true
+    timeout: 600
   install:
     no_hooks: False
   upgrade:
@@ -613,6 +617,7 @@ data:
       release_group: osh-cinder
   test:
     enabled: true
+    timeout: 600
   install:
     no_hooks: False
   upgrade:
@@ -830,6 +835,7 @@ data:
       release_group: osh-nova
   test:
     enabled: true
+    timeout: 900
   install:
     no_hooks: False
   upgrade:
@@ -1051,11 +1057,12 @@ data:
   release: neutron
   namespace: openstack
   wait:
-    timeout: 1800
+    timeout: 2400
     labels:
       release_group: osh-neutron
   test:
     enabled: true
+    timeout: 1200
   install:
     no_hooks: False
   upgrade:
@@ -1215,9 +1222,9 @@ data:
       neutron:
         DEFAULT:
           l3_ha: True
-          max_l3_agents_per_router: 5
+          max_l3_agents_per_router: 1
           l3_ha_network_type: vxlan
-          dhcp_agents_per_network: 2
+          dhcp_agents_per_network: 1
       metadata_agent:
         DEFAULT:
           metadata_proxy_shared_secret: ${METADATA_PROXY_SHARED_SECRET}
@@ -1247,11 +1254,12 @@ data:
   release: heat
   namespace: openstack
   wait:
-    timeout: 1800
+    timeout: 2400
     labels:
       release_group: osh-heat
   test:
     enabled: true
+    timeout: 1200
   install:
     no_hooks: False
   upgrade: