From 8a00fca02a8eaccbcefee3f0f39c6d0ceea996ed Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Tue, 7 Oct 2014 11:18:38 +0100
Subject: [PATCH] Add hp1 back running tripleo ci
hp1 has been rebuilt and tested, we can now add it back running tripleo
ci. Should be merged after Id52212f5096998e7aec6ec5dcb877c4e7dc33dff
which increases overcloud timeouts accordingly.
Change-Id: I5e61f4015d67858d675c0cfea995bbd9df519fd3
---
.../templates/nodepool/nodepool.yaml.erb | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 6aa20438ae..475991fbc2 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -213,11 +213,13 @@ labels:
min-ready: 8
providers:
- name: tripleo-test-cloud-rh1
+ - name: tripleo-test-cloud-hp1
- name: tripleo-f20
image: tripleo-f20
min-ready: 8
providers:
- name: tripleo-test-cloud-rh1
+ - name: tripleo-test-cloud-hp1
providers:
- name: rax-dfw
@@ -949,19 +951,19 @@ providers:
setup: prepare_node_py3k.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- - name: tripleo-test-cloud
+ - name: tripleo-test-cloud-hp1
service-type: 'compute'
service-name: 'nova'
username: '<%= tripleo_username %>'
password: '<%= tripleo_password %>'
project-id: '<%= tripleo_project %>'
- auth-url: 'https://ci-overcloud.tripleo.org:13000/v2.0'
+ auth-url: 'https://ci-overcloud.hp1.tripleo.org:13000/v2.0'
boot-timeout: 120
- max-servers: 0
+ max-servers: 90
rate: 0.001
networks:
- - net-id: a395fac5-adec-4ab9-a605-963558349cfd
- - net-id: 063ec9df-2fec-4723-8d4b-92c60193bd08
+ - net-label: default-net
+ - net-label: tripleo-bm-test
images:
- name: tripleo-precise
base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit'