From: Yifei Xue <xueyifei@huawei.com>
Date: Fri, 16 Mar 2018 06:31:22 +0000 (+0800)
Subject: Bug fix for tacker installation
X-Git-Tag: opnfv-6.0.0~13
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5cb3ed55f09fb23a65a4a4bc03c8e4830ad1573d;p=compass4nfv.git

Bug fix for tacker installation

JIRA: -

By default, os_tacker will use "{{ tacker_bin | dirname }}/etc/tacker"
as tacker_etc_dir. This will cause a failure when keystone creates
fernet key for VIM in tacker due to keystone uses "/etc/tacker" by
default. So this patch is proposed to set tacker_etc_dir to
"/etc/tacker".

Change-Id: Icbffaeb1376f83b4c9904b0258139ce1518ac9f8
Signed-off-by: Yifei Xue <xueyifei@huawei.com>
---

diff --git a/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 b/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2
index 03e3a2af..4f1ea8d5 100644
--- a/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2
+++ b/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2
@@ -71,3 +71,5 @@ security_sshd_permit_root_login: yes
 
 security_ntp_servers:
   - {{ ntp_server }}
+
+tacker_etc_dir: "/etc/tacker"