Revert "Temporarily remove tripleo-ci nodepool provider"

Approve when the tripleo-ci cloud is back on line and verified
responsive again.

This reverts commit e74d5cd9be78c7f3e276a267a20d8397c378f4d9
and updates the configuration to match the new deployment.

Change-Id: I2feabef819aa6698a5d623e4e65bf7673f913c51
This commit is contained in:
Jeremy Stanley 2014-02-06 23:24:17 +00:00 committed by Robert Collins
parent 2a8e85c7f1
commit f48c977da0
2 changed files with 41 additions and 2 deletions

View File

@ -16,7 +16,7 @@
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_EXERCISES=0
export GEARDSERVER=192.168.1.1
export GEARDSERVER=192.168.1.48
export DIB_COMMON_ELEMENTS="stackuser pypi-openstack"
export TRIPLEO_TEST=seed
function gate_hook {
@ -55,7 +55,7 @@
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_EXERCISES=0
export GEARDSERVER=192.168.1.1
export GEARDSERVER=192.168.1.48
export DIB_COMMON_ELEMENTS="stackuser pypi-openstack"
export TRIPLEO_TEST=undercloud
function gate_hook {

View File

@ -207,6 +207,33 @@ providers:
setup: prepare_node_devstack.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: tripleo-test-cloud
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'
boot-timeout: 120
max-servers: 190
networks:
- net-id: f69ac547-db64-4e69-ae70-e5233634aff0
- net-id: b54c5011-519a-4364-8256-a9214eec2387
images:
- name: tripleo-precise
base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit'
min-ram: 8192
name-filter: h1
setup: prepare_node_tripleo.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: tripleo-fedora
base-image: 'Fedora 20 64-bit'
min-ram: 8192
name-filter: h1
setup: prepare_node_tripleo.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
targets:
@ -239,6 +266,14 @@ targets:
providers:
- name: hpcloud-region-b
- name: rax-iad
- name: tripleo-precise
min-ready: 1
providers:
- name: tripleo-test-cloud
- name: tripleo-fedora
min-ready: 1
providers:
- name: tripleo-test-cloud
- name: jenkins02
jenkins:
url: 'https://jenkins02.openstack.org/'
@ -268,6 +303,10 @@ targets:
providers:
- name: hpcloud-region-b
- name: rax-iad
- name: tripleo-precise
min-ready: 1
providers:
- name: tripleo-test-cloud
- name: jenkins03
jenkins:
url: 'https://jenkins03.openstack.org/'