From 34c31c22028d20c1b14bd09d67364d261d8ac6ab Mon Sep 17 00:00:00 2001 From: Jesse Noller Date: Thu, 30 Jan 2014 12:56:48 -0600 Subject: [PATCH] Add Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM) flavor to Rackspace IAD Change-Id: I2b22033a14708f340516da7076fe21b1ccb31d64 Lower min-ready across jenkins, add rax-iad Change-Id: I2b22033a14708f340516da7076fe21b1ccb31d64 --- .../templates/nodepool/nodepool.yaml.erb | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb index 4e72f27666..907886e344 100644 --- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb +++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb @@ -94,6 +94,13 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-precise-check + base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa - name: hpcloud-az1 region-name: 'az-1.region-a.geo-1' service-type: 'compute' @@ -250,9 +257,10 @@ targets: - name: hpcloud-az2 - name: hpcloud-az3 - name: devstack-precise-check - min-ready: 3 + min-ready: 1 providers: - name: hpcloud-region-b + - name: rax-iad - name: tripleo-precise min-ready: 1 providers: @@ -286,9 +294,10 @@ targets: - name: hpcloud-az2 - name: hpcloud-az3 - name: devstack-precise-check - min-ready: 3 + min-ready: 1 providers: - name: hpcloud-region-b + - name: rax-iad - name: tripleo-precise min-ready: 1 providers: @@ -318,9 +327,10 @@ targets: - name: hpcloud-az2 - name: hpcloud-az3 - name: devstack-precise-check - min-ready: 3 + min-ready: 1 providers: - name: hpcloud-region-b + - name: rax-iad - name: jenkins04 jenkins: url: 'https://jenkins04.openstack.org/' @@ -346,9 +356,10 @@ targets: - name: hpcloud-az2 - name: hpcloud-az3 - name: devstack-precise-check - min-ready: 3 + min-ready: 1 providers: - name: hpcloud-region-b + - name: rax-iad - name: jenkins05 jenkins: url: 'https://jenkins05.openstack.org/' @@ -374,9 +385,10 @@ targets: - name: hpcloud-az2 - name: hpcloud-az3 - name: devstack-precise-check - min-ready: 3 + min-ready: 1 providers: - name: hpcloud-region-b + - name: rax-iad - name: jenkins06 jenkins: url: 'https://jenkins06.openstack.org/' @@ -402,9 +414,10 @@ targets: - name: hpcloud-az2 - name: hpcloud-az3 - name: devstack-precise-check - min-ready: 3 + min-ready: 1 providers: - name: hpcloud-region-b + - name: rax-iad - name: jenkins07 jenkins: url: 'https://jenkins07.openstack.org/' @@ -430,9 +443,10 @@ targets: - name: hpcloud-az2 - name: hpcloud-az3 - name: devstack-precise-check - min-ready: 3 + min-ready: 1 providers: - name: hpcloud-region-b + - name: rax-iad - name: dsvm-precise-krnl min-ready: 1 providers: