Break out zuul server and merger

Since it is posible to run zuul-server and zuul-merger on different
hosts, let's demo that.

Change-Id: I2edb3e0bd1c3bc52c6c99c8b60e10d9b5b1dc6eb
Depends-On: I1d99a712984a71f41533cadda317c13f03b9f779
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

windmill/group_vars/zuul-merger.yaml

@@ -0,0 +1,18 @@
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+---
+# windmill.zuul
+zuul_service_zuul_server_enabled: no
+zuul_service_zuul_server_manage: false
+zuul_service_zuul_server_state: stopped

windmill/group_vars/zuul-server.yaml

@@ -0,0 +1,18 @@
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+---
+# windmill.zuul
+zuul_service_zuul_merger_enabled: no
+zuul_service_zuul_merger_manage: false
+zuul_service_zuul_merger_state: stopped

windmill/inventory

@@ -1,2 +1,5 @@
-[zuul]
+[zuul-merger]
+zm01 ansible_host=localhost ansible_user=jenkins
+
+[zuul-server]
 zuul ansible_host=localhost ansible_user=jenkins

windmill/site.yaml

@@ -12,4 +12,5 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-- include: zuul.yaml
+- include: zuul-merger.yaml
+- include: zuul-server.yaml

windmill/zuul-merger.yaml

@@ -12,8 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-- name: Install zuul.
-  hosts: zuul
+- name: Install zuul-merger.
+  hosts: zuul-merger
 
   roles:
     - windmill.zuul

windmill/zuul-server.yaml

@@ -0,0 +1,22 @@
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+---
+- name: Install zuul-server.
+  hosts: zuul-server
+
+  roles:
+    - windmill.zuul
+
+  vars_files:
+    - vars/zuul.yaml