Clean up windmill-config a bit

Noticed a few things when we moved the configuration into the new
folder. Trivial refactor.

Change-Id: I4ed475a7a09dc6aab559b1cc308892541d11ca49
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

config/nodepool/clouds.yaml

@@ -1,3 +1,11 @@
+# This file is generated by Ansible
+#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+#
+cache:
+  expiration:
+    server: 5
+    port: 5
+
 clouds:
   openstackzuul:
     auth:
@@ -10,8 +18,3 @@ clouds:
     identity_api_version: '3'
     region_name: RegionOne
     volume_api_version: '2'
-
-cache:
-  expiration:
-    server: 5
-    port: 5

config/nodepool/nodepool.yaml.j2

@@ -4,22 +4,12 @@
 images-dir: /opt/nodepool/images
 
 zookeeper-servers:
-  - host: '{{ hostvars['zk01'].ansible_host | ipwrap }}'
+{% if 'zookeeper' in groups %}
+{% for host in groups['zookeeper'] %}
+  - host: '{{ hostvars[host].ansible_host | ipwrap }}'
     port: 2181
-
-diskimages:
-  - name: ubuntu-xenial
-    elements:
-      - ubuntu-minimal
-      - growroot
-      - openssh-server
-      - simple-init
-      - vm
-    release: xenial
-    env-vars:
-      TMPDIR: /opt/nodepool/tmp
-      DIB_CHECKSUM: '1'
-      DIB_DEBIAN_COMPONENTS: 'main,universe'
+{% endfor %}
+{% endif %}
 
 labels:
   - name: ubuntu-xenial
@@ -39,3 +29,17 @@ providers:
             diskimage: ubuntu-xenial
             min-ram: 8192
             console-log: true
+
+diskimages:
+  - name: ubuntu-xenial
+    elements:
+      - ubuntu-minimal
+      - growroot
+      - openssh-server
+      - simple-init
+      - vm
+    release: xenial
+    env-vars:
+      TMPDIR: /opt/nodepool/tmp
+      DIB_CHECKSUM: '1'
+      DIB_DEBIAN_COMPONENTS: 'main,universe'

config/zuul/zuul.conf.j2

@@ -34,7 +34,7 @@ log_config = /etc/zuul/executor-logging.conf
 workspace_root = {{ zuul_user_home }}/workspace
 
 [fingergw]
-listen_address = 0.0.0.0
+listen_address = {{ hostvars['zf01'].ansible_host }}
 log_config = /etc/zuul/fingergw-logging.conf
 user = {{ zuul_user_name }}