From 3c405400ea8ecac53a4908771fb86ac043f19041 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Fri, 29 Aug 2014 16:15:32 -0700
Subject: [PATCH] Add zm04

Just add the host def.  Adding it to firewalls, etc, in a
subsequent change.

Change-Id: I0e48f109f30c8ed7f5fa0c2c3bcca2731497377d
---
 manifests/site.pp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index a5a37ab83e..e647e54cd1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -535,6 +535,18 @@ node 'zm03.openstack.org' {
   }
 }
 
+# Node-OS: precise
+node 'zm04.openstack.org' {
+  class { 'openstack_project::zuul_merger':
+    gearman_server       => 'zuul.openstack.org',
+    gerrit_server        => 'review.openstack.org',
+    gerrit_user          => 'jenkins',
+    gerrit_ssh_host_key  => hiera('gerrit_ssh_rsa_pubkey_contents', 'XXX'),
+    zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents', 'XXX'),
+    sysadmins            => hiera('sysadmins', []),
+  }
+}
+
 # Node-OS: precise
 node 'zuul-dev.openstack.org' {
   class { 'openstack_project::zuul_dev':