diff --git a/ansible/group_vars/nodepool.yaml b/ansible/group_vars/nodepool.yaml index 128e743..1366ca2 100644 --- a/ansible/group_vars/nodepool.yaml +++ b/ansible/group_vars/nodepool.yaml @@ -15,7 +15,8 @@ # windmill.nodepool nodepool_user_shell: /bin/bash -nodepool_file_nodepool_yaml_src: "{{ windmill_config_git_dest }}/nodepool/nodepool.yaml.j2" +nodepool_file_secure_conf_src: "{{ windmill_config_git_dest }}/nodepool/secure.conf.j2" +nodepool_file_nodepool_yaml_src: "{{ windmill_config_git_dest }}/nodepool/nodepool.yaml" nodepool_file_builder_logging_conf_manage: false nodepool_file_launcher_logging_conf_manage: false diff --git a/nodepool/nodepool.yaml.j2 b/nodepool/nodepool.yaml similarity index 82% rename from nodepool/nodepool.yaml.j2 rename to nodepool/nodepool.yaml index 2d39407..420a585 100644 --- a/nodepool/nodepool.yaml.j2 +++ b/nodepool/nodepool.yaml @@ -1,17 +1,10 @@ # This file is generated by Ansible # DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN # +--- elements-dir: /etc/nodepool/elements images-dir: /opt/nodepool/images -zookeeper-servers: -{% if 'zookeeper' in groups %} -{% for host in groups['zookeeper'] %} - - host: '{{ hostvars[host].ansible_host | ipwrap }}' - port: 2181 -{% endfor %} -{% endif %} - labels: - name: ubuntu-bionic min-ready: 1 diff --git a/nodepool/secure.conf.j2 b/nodepool/secure.conf.j2 new file mode 100644 index 0000000..cc18c9d --- /dev/null +++ b/nodepool/secure.conf.j2 @@ -0,0 +1,10 @@ +# This file is generated by Ansible +# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN +# +zookeeper-servers: +{% if 'zookeeper' in groups %} +{% for host in groups['zookeeper'] %} + - host: '{{ hostvars[host].ansible_host | ipwrap }}' + port: 2181 +{% endfor %} +{% endif %}