Skip to content

Commit

Permalink
Use consistent terminology accross projects
Browse files Browse the repository at this point in the history
  • Loading branch information
marcransome committed Jun 24, 2021
1 parent d226826 commit 46c4ecf
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions roles/deploy/tasks/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
state: directory
register: new_deployment_files

- name: "{{ tuxedo_user }} : Copy application artefact files to temporary {{ tuxedo_user }} deployment directory"
- name: "{{ tuxedo_user }} : Copy application artifact files to temporary {{ tuxedo_user }} deployment directory"
become_user: "{{ tuxedo_user }}"
command: "cp -r {{ application_artefact_files.path }}/. {{ new_deployment_files.path }}"
command: "cp -r {{ application_artifact_files.path }}/. {{ new_deployment_files.path }}"

- name: "{{ tuxedo_user }} : Create service logs directory"
file:
Expand Down Expand Up @@ -69,7 +69,7 @@
assert:
that:
- idx_configs.files | length > 0
msg: "idx files must exist for service {{ tuxedo_user }} in artefact subdirectory idx/{{ tuxedo_user }}"
msg: "idx files must exist for service {{ tuxedo_user }} in artifact subdirectory idx/{{ tuxedo_user }}"

- name: "{{ tuxedo_user }} : Copy idx files for service to config directory"
become_user: "{{ tuxedo_user }}"
Expand Down
14 changes: 7 additions & 7 deletions roles/deploy/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
assert:
that:
- environment_name is defined and environment_name | trim | length > 0
- application_artefact_path is defined and application_artefact_path | trim | length > 0
- application_artifact_path is defined and application_artifact_path | trim | length > 0
- application_configs_path is defined and application_configs_path | trim | length > 0
msg: "Required variable(s) empty or undefined"

Expand Down Expand Up @@ -45,22 +45,22 @@
- tuxedo_logical_machine_id_suffix
- tuxedo_local_domain_suffix

- name: Create temporary directory for application artefact files
- name: Create temporary directory for application artifact files
tempfile:
state: directory
register: application_artefact_files
register: application_artifact_files

- name: Set permissions to allow service users to read from temporary directory
file:
path: "{{ application_artefact_files.path }}"
path: "{{ application_artifact_files.path }}"
owner: root
group: "{{ tuxedo_service_group }}"
mode: 0755

- name: Deploy and extract application arterfact
unarchive:
src: "{{ application_artefact_path }}"
dest: "{{ application_artefact_files.path }}"
src: "{{ application_artifact_path }}"
dest: "{{ application_artifact_files.path }}"
remote_src: no
owner: root
group: "{{ tuxedo_service_group }}"
Expand Down Expand Up @@ -107,5 +107,5 @@

- name: Remove temporary directories
file:
path: "{{ application_artefact_files.path }}"
path: "{{ application_artifact_files.path }}"
state: absent

0 comments on commit 46c4ecf

Please sign in to comment.