From 7e2c3ec2f56e82ba85f91109137d8ad30bbfd7f0 Mon Sep 17 00:00:00 2001
From: Yotaro Konishi <konishi.yotaro@jp.fujitsu.com>
Date: Mon, 10 Jul 2017 14:03:28 +0900
Subject: [PATCH] Fix an invalid variable name

According to [1], Ansible variable names should not include hyphens.
Kolla-Ansible fails with a wrong variable name 'barbican-api' when
deploying Barbican.

This patch fixes the issue that was recently introduced in [2].

[1] http://docs.ansible.com/ansible/playbooks_variables.html#id15
[2] 08ab3d8e739fc5b499a4cb565cdbcccd6e1c97a1

Change-Id: Ib962e31ad93316e56130c9fc38dabfc918de17ce
Closes-Bug: #1703287
---
 ansible/roles/barbican/tasks/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/barbican/tasks/config.yml b/ansible/roles/barbican/tasks/config.yml
index b4bbc86e35..d4927eae5e 100644
--- a/ansible/roles/barbican/tasks/config.yml
+++ b/ansible/roles/barbican/tasks/config.yml
@@ -39,12 +39,12 @@
 
 - name: Checking whether barbican-api-paste.ini file exists
   vars:
-    barbican-api: "{{ barbican_services['barbican-api'] }}"
+    service: "{{ barbican_services['barbican-api'] }}"
   local_action: stat path="{{ node_custom_config }}/barbican/barbican-api-paste.ini"
   run_once: True
   register: check_barbican_api_paste_ini
   when:
-    - barbican-api.enabled | bool
+    - service.enabled | bool
 
 - name: Copying over barbican-api-paste.ini
   vars: