From f48c977da02ee747fb5da440b9fdd20fbd23a1a8 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 6 Feb 2014 23:24:17 +0000 Subject: [PATCH] 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 --- .../jenkins_job_builder/config/tripleo.yaml | 4 +- .../templates/nodepool/nodepool.yaml.erb | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml index b9e900ec79..dcd4e5e76f 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml @@ -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 { diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb index b7abc33240..78db8e8e3e 100644 --- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb +++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb @@ -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/'