Rename some variables for consistency

This commit is contained in:
Slavi Pantaleev
2020-03-15 10:15:27 +02:00
parent 8fe97abe7d
commit 2b85fde103
20 changed files with 44 additions and 44 deletions

View File

@ -3,7 +3,7 @@
matrix_mxisd_enabled: true
matrix_mxisd_self_build: false
matrix_mxisd_container_image_self_build: false
matrix_mxisd_docker_image: "kamax/mxisd:1.4.6"
matrix_mxisd_docker_image_force_pull: "{{ matrix_mxisd_docker_image.endswith(':latest') }}"

View File

@ -7,4 +7,4 @@
- name: Fail if running on Ansible lower than 2.8 and trying self building
fail:
msg: "To self build Mxisd image, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mxisd_self_build"
when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mxisd_container_image_self_build"

View File

@ -14,7 +14,7 @@
with_items:
- "{{ matrix_mxisd_config_path }}"
- "{{ matrix_mxisd_data_path }}"
- { src: "{{ matrix_mxisd_docker_src_files_path }}", when: "{{ matrix_mxisd_self_build }}"}
- { src: "{{ matrix_mxisd_docker_src_files_path }}", when: "{{ matrix_mxisd_container_image_self_build }}"}
when: matrix_mxisd_enabled|bool
- name: Ensure mxisd image is pulled
@ -23,7 +23,7 @@
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_mxisd_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mxisd_docker_image_force_pull }}"
when: matrix_mxisd_enabled|bool and not matrix_mxisd_self_build
when: matrix_mxisd_enabled|bool and not matrix_mxisd_container_image_self_build
- name: Ensure gradel is installed for self-building
apt:
@ -31,7 +31,7 @@
- gradle
state: present
update_cache: yes
when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
when: "matrix_mxisd_enabled|bool and matrix_mxisd_container_image_self_build"
- name: Ensure mxisd repository is present on self-build
git:
@ -39,13 +39,13 @@
dest: "{{ matrix_mxisd_docker_src_files_path }}"
version: "v{{ matrix_mxisd_docker_image.split(':')[1] }}"
force: "yes"
when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
when: "matrix_mxisd_enabled|bool and matrix_mxisd_container_image_self_build"
- name: Ensure mxisd Docker image is build
shell: "./gradlew dockerBuild"
args:
chdir: "{{ matrix_mxisd_docker_src_files_path }}"
when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
when: "matrix_mxisd_enabled|bool and matrix_mxisd_container_image_self_build"
- name: Ensure mxisd config installed
copy: