From df845bfd891aa5504ee91723d9130aa0aaae352b Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Wed, 21 May 2014 09:40:27 +0100
Subject: [PATCH] Move back to 8G tripleo nodes

This was increased some time ago to workaround a bug, the bug is now
fixed. max-servers on the rh1 provider can also be increased to 18(we
have 18 testenvs) as we will now be able to hold more instances.

Change-Id: I23e28b7cf55b099df73f55bf57d7cc0cbc78d969
---
 .../templates/nodepool/nodepool.yaml.erb               | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 7fee37611d..c1801c047a 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -439,14 +439,14 @@ providers:
     images:
       - name: tripleo-precise
         base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit'
-        min-ram: 16384
+        min-ram: 8192
         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
+        min-ram: 8192
         name-filter: h1
         setup: prepare_node_tripleo.sh
         username: jenkins
@@ -459,7 +459,7 @@ providers:
     project-id: '<%= tripleo_project %>'
     auth-url: 'https://ci-overcloud.rh1.tripleo.org:13000/v2.0'
     boot-timeout: 120
-    max-servers: 10
+    max-servers: 18
     rate: 0.001
     networks:
       - net-id: 505a106c-7d65-44a7-b3e7-99bb49d2ebab
@@ -467,14 +467,14 @@ providers:
     images:
       - name: tripleo-precise
         base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit'
-        min-ram: 16384
+        min-ram: 8192
         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
+        min-ram: 8192
         name-filter: h1
         setup: prepare_node_tripleo.sh
         username: jenkins