3 Commits

Author SHA1 Message Date
James E. Blair
9c73295557 Add gerrit ip addrs to zuul's known_hosts
Otherwise we get warnings from ssh.

Change-Id: I0a7cb1c4933c3ac3aaba8cc3018ad0c470d19e05
2014-02-18 10:10:30 -08:00
James E. Blair
17e09934db Fix zuul installation
The following items were missing from an automated zuul install:

 * A pre-populated known hosts file
 * The git user/email for creating commits (.gitconfig existed
   on zuul.o.o, but switch to using zuul's config file instead).

Also, make sure that the mergers specify the zuul server as the
gearman server address rather than localhost.

Change-Id: I47a473f60c4b5b2daaa910aa61cdf6e0c6fe1528
2014-02-18 02:33:24 +00:00
James E. Blair
083281f7ee Add Zuul merge servers
Remove obsolete config options from zuul module.

The server and merger classes are constructed so that they
may coexist on a single server.  Also, the init section is
constructed so that it will install everything needed for
both services but without activating them (leaving maximum
flexibility for the operator).

Change-Id: I7b86fbbe4611c5edfb463a0a6944e0717f664188
2014-02-17 11:11:21 -08:00