From 6aef98b142db1bf8d08f0566f7f26a39e5c34069 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 16 Nov 2017 16:37:43 +0000
Subject: [PATCH] Add a variable to kolla-ansible role for path to
 passwords.yml

This is the input file kept in $KAYOBE_CONFIG_PATH, rather than the generated
file in .
---
 ansible/kolla-ansible.yml                     | 1 +
 ansible/roles/kolla-ansible/defaults/main.yml | 3 +++
 ansible/roles/kolla-ansible/tasks/config.yml  | 6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ansible/kolla-ansible.yml b/ansible/kolla-ansible.yml
index 3a14dc8f1..c3fd6e51b 100644
--- a/ansible/kolla-ansible.yml
+++ b/ansible/kolla-ansible.yml
@@ -198,3 +198,4 @@
 
   roles:
     - role: kolla-ansible
+      kolla_ansible_passwords_path: "{{ kayobe_config_path }}/kolla/passwords.yml"
diff --git a/ansible/roles/kolla-ansible/defaults/main.yml b/ansible/roles/kolla-ansible/defaults/main.yml
index da88e5f45..246b68cea 100644
--- a/ansible/roles/kolla-ansible/defaults/main.yml
+++ b/ansible/roles/kolla-ansible/defaults/main.yml
@@ -24,6 +24,9 @@ kolla_config_path:
 # Directory where Kolla custom configuration files will be installed.
 kolla_node_custom_config_path:
 
+# Path to kolla-ansible passwords.yml input file.
+kolla_ansible_passwords_path:
+
 ###############################################################################
 # Kolla-ansible inventory configuration.
 
diff --git a/ansible/roles/kolla-ansible/tasks/config.yml b/ansible/roles/kolla-ansible/tasks/config.yml
index e0dddff9c..e3c2e587a 100644
--- a/ansible/roles/kolla-ansible/tasks/config.yml
+++ b/ansible/roles/kolla-ansible/tasks/config.yml
@@ -35,8 +35,8 @@
 
 - name: Ensure the Kolla passwords file exists
   kolla_passwords:
-    src: "{{ kayobe_config_path }}/kolla/passwords.yml"
-    dest: "{{ kayobe_config_path }}/kolla/passwords.yml"
+    src: "{{ kolla_ansible_passwords_path }}"
+    dest: "{{ kolla_ansible_passwords_path }}"
     mode: 0640
     sample: "{{ kolla_ansible_install_dir }}/etc_examples/kolla/passwords.yml"
     overrides: "{{ kolla_ansible_custom_passwords }}"
@@ -45,6 +45,6 @@
 
 - name: Ensure the Kolla passwords file is copied into place
   copy:
-    src: "{{ kayobe_config_path }}/kolla/passwords.yml"
+    src: "{{ kolla_ansible_passwords_path }}"
     dest: "{{ kolla_config_path }}/passwords.yml"
     remote_src: True