Merge "Revert "Stop using hpcloud az1-az3 in favor of region-b""

This commit is contained in:
Jenkins 2014-03-26 01:11:38 +00:00 committed by Gerrit Code Review
commit 687b6bb101

View File

@ -162,7 +162,7 @@ providers:
project-id: '<%= hpcloud_project %>'
auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0'
boot-timeout: 180
max-servers: 0
max-servers: 48
images:
- name: devstack-precise
base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
@ -197,7 +197,7 @@ providers:
project-id: '<%= hpcloud_project %>'
auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0'
boot-timeout: 180
max-servers: 0
max-servers: 192
images:
- name: devstack-precise
base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
@ -232,7 +232,7 @@ providers:
project-id: '<%= hpcloud_project %>'
auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0'
boot-timeout: 180
max-servers: 0
max-servers: 48
images:
- name: devstack-precise
base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
@ -284,7 +284,7 @@ providers:
project-id: '<%= hpcloud_project %>'
auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
boot-timeout: 120
max-servers: 590
max-servers: 28
images:
- name: devstack-precise-check
base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)'
@ -360,6 +360,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: bare-centos6
min-ready: 2
@ -367,6 +370,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: devstack-precise
min-ready: 6
@ -374,6 +380,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: devstack-precise-check
min-ready: 1
@ -382,6 +391,9 @@ targets:
- name: py3k-precise
min-ready: 1
providers:
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: tripleo-precise
min-ready: 5
@ -404,6 +416,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: bare-centos6
min-ready: 2
@ -411,6 +426,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: devstack-precise
min-ready: 6
@ -418,6 +436,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: devstack-precise-check
min-ready: 1
@ -426,6 +447,9 @@ targets:
- name: py3k-precise
min-ready: 1
providers:
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: tripleo-precise
min-ready: 5
@ -448,6 +472,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: bare-centos6
min-ready: 2
@ -455,6 +482,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: devstack-precise
min-ready: 6
@ -462,6 +492,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: devstack-precise-check
min-ready: 1
@ -470,6 +503,9 @@ targets:
- name: py3k-precise
min-ready: 1
providers:
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: tripleo-precise
min-ready: 5
@ -492,6 +528,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: bare-centos6
min-ready: 2
@ -499,6 +538,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: devstack-precise
min-ready: 6
@ -506,6 +548,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: devstack-precise-check
min-ready: 1
@ -514,6 +559,9 @@ targets:
- name: py3k-precise
min-ready: 1
providers:
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: tripleo-precise
min-ready: 5
@ -536,6 +584,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: bare-centos6
min-ready: 2
@ -543,6 +594,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: devstack-precise
min-ready: 6
@ -550,6 +604,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: devstack-precise-check
min-ready: 1
@ -558,6 +615,9 @@ targets:
- name: py3k-precise
min-ready: 1
providers:
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: tripleo-precise
min-ready: 5
@ -580,6 +640,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: bare-centos6
min-ready: 2
@ -587,6 +650,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: devstack-precise
min-ready: 6
@ -594,6 +660,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: devstack-precise-check
min-ready: 1
@ -602,6 +671,9 @@ targets:
- name: py3k-precise
min-ready: 1
providers:
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: tripleo-precise
min-ready: 5
@ -624,6 +696,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: bare-centos6
min-ready: 2
@ -631,6 +706,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: devstack-precise
min-ready: 6
@ -638,6 +716,9 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: devstack-precise-check
min-ready: 1
@ -646,6 +727,9 @@ targets:
- name: py3k-precise
min-ready: 1
providers:
- name: hpcloud-az1
- name: hpcloud-az2
- name: hpcloud-az3
- name: hpcloud-region-b
- name: dsvm-precise-krnl
min-ready: 1