Move zookeeper info into secure.conf

Split zookeeper into secure.conf, as it might have username / password
info.

Change-Id: I49ea31c957af3705048549b1c9ee7b05b13eb7f2
Depends-On: https://review.openstack.org/645965
Depends-On: https://review.openstack.org/645969
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2019-03-22 21:30:50 -04:00
parent 1b869737ee
commit fd59c1a385
3 changed files with 13 additions and 9 deletions

View File

@ -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

View File

@ -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

10
nodepool/secure.conf.j2 Normal file
View File

@ -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 %}