openstack/kayobe
Code Issues Proposed changes

Add a variable to kolla-ansible role for path to passwords.yml

Browse Source 
This is the input file kept in $KAYOBE_CONFIG_PATH, rather than the generated
file in .
This commit is contained in:
Mark Goddard
2017-11-16 16:37:43 +00:00
parent 10212674ac
commit 6aef98b142
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/kolla-ansible.yml
View File

@@ -198,3 +198,4 @@
roles: roles:
- role: kolla-ansible - role: kolla-ansible
kolla_ansible_passwords_path: "{{ kayobe_config_path }}/kolla/passwords.yml"

3
ansible/roles/kolla-ansible/defaults/main.yml
View File

@@ -24,6 +24,9 @@ kolla_config_path:
# Directory where Kolla custom configuration files will be installed. # Directory where Kolla custom configuration files will be installed.
kolla_node_custom_config_path: kolla_node_custom_config_path:
# Path to kolla-ansible passwords.yml input file.
kolla_ansible_passwords_path:
############################################################################### ###############################################################################
# Kolla-ansible inventory configuration. # Kolla-ansible inventory configuration.

6
ansible/roles/kolla-ansible/tasks/config.yml
View File

@@ -35,8 +35,8 @@
- name: Ensure the Kolla passwords file exists - name: Ensure the Kolla passwords file exists
kolla_passwords: kolla_passwords:
src: "{{ kayobe_config_path }}/kolla/passwords.yml" src: "{{ kolla_ansible_passwords_path }}"
dest: "{{ kayobe_config_path }}/kolla/passwords.yml" dest: "{{ kolla_ansible_passwords_path }}"
mode: 0640 mode: 0640
sample: "{{ kolla_ansible_install_dir }}/etc_examples/kolla/passwords.yml" sample: "{{ kolla_ansible_install_dir }}/etc_examples/kolla/passwords.yml"
overrides: "{{ kolla_ansible_custom_passwords }}" overrides: "{{ kolla_ansible_custom_passwords }}"
@@ -45,6 +45,6 @@
- name: Ensure the Kolla passwords file is copied into place - name: Ensure the Kolla passwords file is copied into place
copy: copy:
src: "{{ kayobe_config_path }}/kolla/passwords.yml" src: "{{ kolla_ansible_passwords_path }}"
dest: "{{ kolla_config_path }}/passwords.yml" dest: "{{ kolla_config_path }}/passwords.yml"
remote_src: True remote_src: True