Merge "Set appropriate branch key in _horizon_translations_pull"

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

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