From f935ee344f15e76a75bedb4598ede4415cb13ac6 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Thu, 3 Apr 2014 15:37:11 +0100 Subject: [PATCH] Add the second tripleo provider Adding tripleo-test-cloud-rh1, only allowing 10 instances for the moment, once we get back to 8G nodepool instances we can double this. Change-Id: I1325bb2bd22c16e0a11c7efb066c6e54eaa8ac6a --- .../templates/nodepool/nodepool.yaml.erb | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb index b6ce3467a2..a07171b68d 100644 --- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb +++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb @@ -75,11 +75,13 @@ labels: min-ready: 10 providers: - name: tripleo-test-cloud + - name: tripleo-test-cloud-rh1 - name: tripleo-f20 image: tripleo-f20 min-ready: 2 providers: - name: tripleo-test-cloud + - name: tripleo-test-cloud-rh1 providers: - name: rax-dfw @@ -407,6 +409,34 @@ providers: setup: prepare_node_tripleo.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: tripleo-test-cloud-rh1 + service-type: 'compute' + service-name: 'nova' + username: '<%= tripleo_username %>' + password: '<%= tripleo_password %>' + project-id: '<%= tripleo_project %>' + auth-url: 'https://ci-overcloud.rh1.tripleo.org:13000/v2.0' + boot-timeout: 120 + max-servers: 10 + rate: 0.001 + networks: + - net-id: 505a106c-7d65-44a7-b3e7-99bb49d2ebab + - net-id: deedbc59-a076-4d9c-94a8-21fc5a7b8e0b + images: + - name: tripleo-precise + base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit' + min-ram: 16384 + name-filter: h1 + setup: prepare_node_tripleo.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: tripleo-f20 + base-image: 'Fedora 20 64-bit' + min-ram: 16384 + name-filter: h1 + setup: prepare_node_tripleo.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa targets: - name: jenkins01