From 4fca593c327455130fffd326ff45e0f06d386754 Mon Sep 17 00:00:00 2001
From: Elizabeth Krumbach Joseph <lyz@princessleia.com>
Date: Fri, 18 Oct 2013 10:08:35 -0700
Subject: [PATCH] Restore tripleo nodepool config
TripleO image now successfully builds in a nodepool dev environment,
restoring configuration to nodepool.
Change-Id: Ic2552f9656c21132d11646f688bbcb1a131da34e
---
.../templates/nodepool/nodepool.yaml.erb | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index da719ed9a0..2ef583b748 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -116,6 +116,22 @@ 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://poc.tripleo.org:10000/v2.0'
+ boot-timeout: 120
+ max-servers: 2
+ images:
+ - name: tripleo-precise
+ base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit'
+ min-ram: 8192
+ setup: prepare_node_tripleo.sh
+ username: jenkins
+ private-key: /home/nodepool/.ssh/id_rsa
targets:
- name: jenkins01
@@ -137,6 +153,10 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
+ - name: tripleo-precise
+ min-ready: 1
+ providers:
+ - name: tripleo-test-cloud
- name: jenkins02
jenkins:
url: 'https://jenkins02.openstack.org/'
@@ -156,3 +176,7 @@ targets:
- name: rax-iad
- name: rax-dfw
- name: rax-ord
+ - name: tripleo-precise
+ min-ready: 1
+ providers:
+ - name: tripleo-test-cloud