Merge "Adjust tripleo nodepool config to actual values"

This commit is contained in:
Jenkins 2014-03-15 00:05:25 +00:00 committed by Gerrit Code Review
commit 0433d760c4

View File

@ -300,7 +300,7 @@ providers:
project-id: '<%= tripleo_project %>' project-id: '<%= tripleo_project %>'
auth-url: 'https://ci-overcloud.tripleo.org:13000/v2.0' auth-url: 'https://ci-overcloud.tripleo.org:13000/v2.0'
boot-timeout: 120 boot-timeout: 120
max-servers: 190 max-servers: 50
rate: 0.001 rate: 0.001
networks: networks:
- net-id: f69ac547-db64-4e69-ae70-e5233634aff0 - net-id: f69ac547-db64-4e69-ae70-e5233634aff0
@ -308,7 +308,7 @@ providers:
images: images:
- name: tripleo-precise - name: tripleo-precise
base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit' base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit'
min-ram: 8192 min-ram: 16384
name-filter: h1 name-filter: h1
setup: prepare_node_tripleo.sh setup: prepare_node_tripleo.sh
username: jenkins username: jenkins