windmill
/
ansible-role-nodepool
Code Issues Proposed changes

Drop support for clouds.yaml 

This really belongs in os-cloud-config role, not nodepool. For now,
users can template the file themself.

Change-Id: Ie03272f84ed22d5c01bd21bcd06f77c67e4032da
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-09-05 12:45:57 -04:00
parent 70feab610d
commit 2f6300cf03
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yaml
View File

@ -45,10 +45,6 @@ nodepool_config_scripts_dir: "{{ nodepool_scripts_dir_dest }}"
nodepool_file_logging_conf: etc/nodepool/logging.conf
nodepool_template_clouds_yaml_contents: ""
nodepool_template_clouds_yaml_dest: "{{ nodepool_user_home }}/.config/openstack/clouds.yaml"
nodepool_template_clouds_yaml_src: var/lib/nodepool/.config/openstack/clouds.yaml.j2
nodepool_template_secure_conf_contents: ""
nodepool_template_secure_conf_dest: /etc/nodepool/secure.conf
nodepool_template_secure_conf_src: etc/nodepool/secure.conf.j2

6
tasks/config.yaml
View File

@ -25,12 +25,6 @@
- "{{ nodepool_user_home }}/.config/openstack"
- /var/log/nodepool
- name: Template clouds yaml file.
become: yes
template:
dest: "{{ nodepool_template_clouds_yaml_dest }}"
src: "{{ nodepool_template_clouds_yaml_src }}"
- name: Template secure configuration file.
become: yes
template:

4
templates/var/lib/nodepool/.config/openstack/clouds.yaml.j2
View File

@ -1,4 +0,0 @@
# This file is generated by Ansible
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
#
{{ nodepool_template_clouds_yaml_contents | to_nice_yaml }}