From 58b430dc22b0e770ee0e6787c45967dd55bd06c0 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 20 May 2014 23:47:25 +0000 Subject: [PATCH] Revert "Revert "Stop using hpcloud az1-az3 in favor of region-b"" We have the ability to track failure rates better now, so we should be able to get some good numbers on whether this is terrible or not. This reverts commit a906e4b52b8bcddfb6b3346885f99c937b87a0df. Conflicts: modules/openstack_project/templates/nodepool/nodepool.yaml.erb Change-Id: Id9f27f5d4ec8788ea6a4d67fb15aa81cb2e7f1c3 --- .../templates/nodepool/nodepool.yaml.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb index 7fee37611d..e5a09b97bd 100644 --- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb +++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb @@ -269,7 +269,7 @@ providers: project-id: '<%= hpcloud_project %>' auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0' boot-timeout: 180 - max-servers: 48 + max-servers: 0 images: - name: devstack-precise base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image' @@ -304,7 +304,7 @@ providers: project-id: '<%= hpcloud_project %>' auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0' boot-timeout: 180 - max-servers: 192 + max-servers: 0 images: - name: devstack-precise base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image' @@ -339,7 +339,7 @@ providers: project-id: '<%= hpcloud_project %>' auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0' boot-timeout: 180 - max-servers: 48 + max-servers: 0 images: - name: devstack-precise base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image' @@ -391,7 +391,7 @@ providers: project-id: '<%= hpcloud_project %>' auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0' boot-timeout: 120 - max-servers: 200 + max-servers: 590 images: - name: devstack-precise-check base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'