Merge "Add launch-timeout validator into config-validation."

devstack/plugin.sh

@@ -185,6 +185,7 @@ providers:
     api-timeout: 60
     # Long boot timeout to deal with potentially nested virt.
     boot-timeout: 600
+    launch-timeout: 900
     max-servers: 2
     rate: 0.25
     images:

nodepool/cmd/config_validator.py

@@ -72,6 +72,7 @@ class ConfigValidator:
             'networks': [v.Any(old_network, network)],
             'boot-timeout': int,
             'api-timeout': int,
+            'launch-timeout': int,
             'rate': float,
             'images': [images],
             'template-hostname': str

nodepool/tests/fixtures/config_validate/good.yaml

@@ -444,6 +444,7 @@ providers:
     region-name: 'region-b.geo-1'
     api-timeout: 60
     boot-timeout: 120
+    launch-timeout: 900
     max-servers: 100
     networks:
       - net-id: b6596f90-914a-41e9-b01a-223d90b86e8d
@@ -534,6 +535,7 @@ providers:
     auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
     api-timeout: 60
     boot-timeout: 120
+    launch-timeout: 900
     max-servers: 100
     networks:
       - net-id: 90169672-ad5a-4fd5-a1b6-af121203f95c
@@ -623,6 +625,7 @@ providers:
     auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
     api-timeout: 60
     boot-timeout: 120
+    launch-timeout: 900
     max-servers: 100
     networks:
       - net-id: 63657422-b84f-4d2d-b7d2-765ac560546b
@@ -712,6 +715,7 @@ providers:
     auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
     api-timeout: 60
     boot-timeout: 120
+    launch-timeout: 900
     max-servers: 100
     networks:
       - net-id: f6d0d957-f31d-4e3b-9c07-3d2a4feebc03
@@ -802,6 +806,7 @@ providers:
     auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
     api-timeout: 60
     boot-timeout: 120
+    launch-timeout: 900
     max-servers: 100
     networks:
       - net-id: b96c212f-16e1-4b9c-a3d2-09b3871220c2