openstack/openstack-ansible-os_horizon
Code Issues Proposed changes

Set appropriate branch key in _horizon_translations_pull

Browse Source 
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
This commit is contained in:
Dmitriy Rabotjagov 2019-02-28 12:39:17 +02:00 committed by Dmitriy Rabotjagov (noonedeadpunk)
parent 60ae573179
commit 52ca70be38
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/horizon_translations_update.yml
View File

@ -14,14 +14,14 @@
# limitations under the License. # limitations under the License.
- name: Perform a Zanata Pull Catalog - 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: args:
chdir: "{{ horizon_lib_dir }}/" chdir: "{{ horizon_lib_dir }}/"
with_items: "{{ horizon_translations_pull }}" with_items: "{{ horizon_translations_pull }}"
loop_control: loop_control:
loop_var: translation loop_var: translation
when: when:
- translation.enabled | bool - (translation.enabled | default("True")) | bool
notify: notify:
- Compile messages - Compile messages
- Restart apache2 - Restart apache2

12
vars/main.yml
View File

@ -15,29 +15,29 @@
_horizon_translations_pull: _horizon_translations_pull:
- project: "horizon" - project: "horizon"
branch: master branch: "{{ horizon_translations_project_version }}"
enabled: True enabled: True
module: module:
- horizon - horizon
- openstack_auth - openstack_auth
- openstack_dashboard - openstack_dashboard
- project: "designate-dashboard" - project: "designate-dashboard"
branch: master branch: "{{ horizon_translations_project_version }}"
enabled: True enabled: True
module: designatedashboard module: designatedashboard
- project: "sahara-dashboard" - project: "sahara-dashboard"
branch: master branch: "{{ horizon_translations_project_version }}"
enabled: True enabled: True
module: sahara_dashboard module: sahara_dashboard
- project: "heat-dashboard" - project: "heat-dashboard"
branch: master branch: "{{ horizon_translations_project_version }}"
enabled: "{{ horizon_enable_heat_ui }}" enabled: "{{ horizon_enable_heat_ui }}"
module: heat_dashboard module: heat_dashboard
- project: "magnum-ui" - project: "magnum-ui"
branch: master branch: "{{ horizon_translations_project_version }}"
enabled: True enabled: True
module: magnum_ui module: magnum_ui
- project: "trove-dashboard" - project: "trove-dashboard"
branch: master branch: "{{ horizon_translations_project_version }}"
enabled: True enabled: True
module: trove_dashboard module: trove_dashboard