From 52ca70be385aa2cf1f43e5064f8631746d0d6255 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotjagov <dmitriy.r@sitevalley.com>
Date: Thu, 28 Feb 2019 12:39:17 +0200
Subject: [PATCH] Set appropriate branch key in _horizon_translations_pull

Once branch is defined in _horizon_translations_pull, variable
horizon_translations_project_version was not influencing anyhow on the
pull process, as it was set as default variable, when branch not defined

With this change horizon_translations_project_version was set as
branch in vars, with default value of master.

Change-Id: I4a9c3b2bdc442b5cbcc28672931190c53023ab82
---
 tasks/horizon_translations_update.yml |  4 ++--
 vars/main.yml                         | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tasks/horizon_translations_update.yml b/tasks/horizon_translations_update.yml
index 172cf7d4..cffd2762 100644
--- a/tasks/horizon_translations_update.yml
+++ b/tasks/horizon_translations_update.yml
@@ -14,14 +14,14 @@
 # limitations under the License.
 
 - name: Perform a Zanata Pull Catalog
-  command: "{{ horizon_manage }} pull_catalog -p {{ translation.project }} -m {{ translation.module }} -b {{ (translation.branch | default(horizon_translations_project_version)) | replace('/', '-') }}"
+  command: "{{ horizon_manage }} pull_catalog -p {{ translation.project }} -m {{ translation.module }} -b {{ (translation.branch | default('master')) | replace('/', '-') }}"
   args:
     chdir: "{{ horizon_lib_dir }}/"
   with_items: "{{ horizon_translations_pull }}"
   loop_control:
     loop_var: translation
   when:
-    - translation.enabled | bool
+    - (translation.enabled | default("True")) | bool
   notify:
     - Compile messages
     - Restart apache2
diff --git a/vars/main.yml b/vars/main.yml
index 7c07fcf6..17d28fdd 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -15,29 +15,29 @@
 
 _horizon_translations_pull:
   - project: "horizon"
-    branch: master
+    branch: "{{ horizon_translations_project_version }}"
     enabled: True
     module:
       - horizon
       - openstack_auth
       - openstack_dashboard
   - project: "designate-dashboard"
-    branch: master
+    branch: "{{ horizon_translations_project_version }}"
     enabled: True
     module: designatedashboard
   - project: "sahara-dashboard"
-    branch: master
+    branch: "{{ horizon_translations_project_version }}"
     enabled: True
     module: sahara_dashboard
   - project: "heat-dashboard"
-    branch: master
+    branch: "{{ horizon_translations_project_version }}"
     enabled: "{{ horizon_enable_heat_ui }}"
     module: heat_dashboard
   - project: "magnum-ui"
-    branch: master
+    branch: "{{ horizon_translations_project_version }}"
     enabled: True
     module: magnum_ui
   - project: "trove-dashboard"
-    branch: master
+    branch: "{{ horizon_translations_project_version }}"
     enabled: True
     module: trove_dashboard