Rename pull_catalog args from version to branch

This is required after duplicate argument settings, fixed in
https://review.openstack.org/#/c/559071/

The branch must be overridable per item, and should default
to the master branch, and be the same for all the items
by default.

Change-Id: I656c8793714b5dc764d7aa0cef28e5eca65d927a
Co-Authored-By: Jean-Philippe Evrard <jean-philippe@evrard.me>
This commit is contained in:
Frank Kloeker 2018-04-06 10:18:30 +02:00 committed by Jean-Philippe Evrard
parent 98c973739d
commit c3a1fe8954
3 changed files with 21 additions and 4 deletions

@ -326,7 +326,12 @@ horizon_translations_update: False
# This variable is used to define the version of the project
# (horizon) to pull from Zanata. Default value is master,
# other possibly values are stable/pike, stable/queens...
horizon_translations_project_version: master
horizon_translations_project_version: "master"
# This variable is used to be able to fully override or
# partially union/intersect lists in order to change the
# behaviour of the pull of the translations per component.
horizon_translations_pull: "{{ _horizon_translations_pull }}"
# This variable is used by the repo_build process to determine
# which host group to check for members of before building the

@ -13,13 +13,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Perform a Horizon Zanata Pull Catalog
command: "{{ horizon_bin }}/horizon-manage.py pull_catalog -v {{ horizon_translations_project_version | replace('/', '-') }}"
- name: Perform a Zanata Pull Catalog
command: "{{ horizon_bin }}/horizon-manage.py pull_catalog -p {{ translation.project }} -b {{ (translation.branch | default(horizon_translations_project_version)) | replace('/', '-') }}"
args:
chdir: "{{ horizon_lib_dir }}/"
changed_when: false
with_items: "{{ horizon_translations_pull }}"
loop_control:
loop_var: translation
when:
- translation.enabled | bool
- name: Perform Horizon Zanata Compile Messages
- name: Perform Zanata Compile Messages
command: "{{ horizon_bin }}/horizon-manage.py compilemessages"
args:
chdir: "{{ horizon_lib_dir }}/{{ item }}"

@ -101,3 +101,10 @@ _horizon_panels:
- src: "{{ horizon_lib_dir }}/octavia_dashboard/enabled/_1482_project_load_balancer_panel.py"
path: "{{ horizon_lib_dir }}/openstack_dashboard/local/enabled/_1482_project_load_balancer_panel.py"
state: "{{ (horizon_enable_octavia_ui | bool) | ternary('link', 'absent') }}"
_horizon_translations_pull:
- project: "horizon"
enabled: True
- project: "heat-dashboard"
enabled: "{{ horizon_enable_heat_ui }}"