Update Zuul and Nodepool config file

- Zuul and Nodepool configuration files were updated
- Gearman logging was reduced due to increased number of log entries
  after update

Change-Id: I20d5dc6868653c37352cf17b9066f883035356da

config/nodepool/savanna.yaml

@@ -10,6 +10,18 @@ zmq-publishers:
 gearman-servers:
   - host: 127.0.0.1
 
+labels:
+  - name:  precise
+    image: precise
+    min-ready: 5
+    providers:
+      - name: ci-lab
+  - name:  ui
+    image: ui
+    min-ready: 1
+    providers:
+      - name: ci-lab
+
 providers:
   - name: ci-lab
     username: 'ci-user'
@@ -39,12 +51,3 @@ targets:
       user: admin
       apikey: JENKINS_API_KEY
       credentials-id: CREDENTIALS_ID
-    images:
-      - name: ui
-        min-ready: 1
-        providers:
-          - name: ci-lab
-      - name: precise
-        min-ready: 5
-        providers:
-          - name: ci-lab

config/zuul/gearman-logging.conf

@@ -12,7 +12,7 @@ level=WARNING
 handlers=console
 
 [logger_gear]
-level=INFO
+level=WARNING
 handlers=normal
 qualname=gear
 
@@ -23,7 +23,7 @@ formatter=simple
 args=(sys.stdout,)
 
 [handler_normal]
-level=INFO
+level=WARNING
 class=logging.handlers.TimedRotatingFileHandler
 formatter=simple
 args=('/var/log/zuul/gearman-server.log', 'midnight', 1, 30,)

config/zuul/zuul.conf

@@ -17,13 +17,15 @@ layout_config=/etc/zuul/layout.yaml
 log_config=/etc/zuul/logging.conf
 pidfile=/var/run/zuul/zuul.pid
 state_dir=/var/lib/zuul
-git_dir=/var/lib/zuul/git
-;git_user_email=zuul@example.com
-;git_user_name=zuul
-url_pattern=http://savanna.mirantis.com/logs/{build.parameters[LOG_PATH]}
+url_pattern=http://sahara.mirantis.com/logs/{build.parameters[LOG_PATH]}
 job_name_in_report=true
-status_url=https://savanna.mirantis.com/zuul/
+status_url=https://sahara.mirantis.com/zuul/
+
+[merger]
+git_dir=/var/lib/zuul/git
 zuul_url=http://172.18.87.221/p
+log_config=/etc/zuul/logging.conf
+pidfile=/var/run/zuul-merger/zuul-merger.pid
 
 [smtp]
 server=localhost