From c207520ca5c5a5661ee5b86e62d75a499bc53bd6 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date: Thu, 12 Oct 2017 16:34:09 +0200
Subject: [PATCH] post-deploy: honour --config-dir argument

kolla-ansible can take globals.yml from any directory by using
--config-dir argument. So store admin credentials there as well.

Not everyone runs kolla-ansible as a root.

Change-Id: I0709482ead4b7a67e82796e17f85bde151e71bc0
---
 ansible/post-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/post-deploy.yml b/ansible/post-deploy.yml
index 1cecaf1faa..2e1f9ef97d 100644
--- a/ansible/post-deploy.yml
+++ b/ansible/post-deploy.yml
@@ -5,5 +5,5 @@
   tasks:
     - template:
         src: "roles/common/templates/admin-openrc.sh.j2"
-        dest: "{{ node_config_directory }}/admin-openrc.sh"
+        dest: "{{ CONFIG_DIR | default('/etc/kolla') }}/admin-openrc.sh"
       run_once: True