From 95132ab61ce415f0d2af74ee9dfdc41900d30b97 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 10 Jul 2026 08:46:06 +0200 Subject: [PATCH] chore: fix ansible var names --- .gitea/workflows/deploy-bin.yml | 4 ++-- .gitea/workflows/deploy-py-agebd.yml | 4 ++-- ansible/playbooks/add-new-service.yml | 6 ++--- ansible/plays/ioc/ioc-install.yml | 22 ++++++++--------- ansible/plays/ioc/ioc-restart.yml | 14 +++++------ ansible/plays/ioc/ioc-start.yml | 6 ++--- .../service/service-deploy-and-restart.yml | 24 +++++++++---------- 7 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitea/workflows/deploy-bin.yml b/.gitea/workflows/deploy-bin.yml index 61e6a9c..fbd29d3 100644 --- a/.gitea/workflows/deploy-bin.yml +++ b/.gitea/workflows/deploy-bin.yml @@ -7,8 +7,8 @@ on: tags: - 'prod' - 'v*' - # paths: - # - 'bin/**' + paths: + - 'bin/**' jobs: deploy: diff --git a/.gitea/workflows/deploy-py-agebd.yml b/.gitea/workflows/deploy-py-agebd.yml index dbdc4f5..58ee985 100644 --- a/.gitea/workflows/deploy-py-agebd.yml +++ b/.gitea/workflows/deploy-py-agebd.yml @@ -8,8 +8,8 @@ on: tags: - 'prod' - 'v*' -# paths: -# - 'packages/agebd/**' + paths: + - 'packages/agebd/**' jobs: deploy: diff --git a/ansible/playbooks/add-new-service.yml b/ansible/playbooks/add-new-service.yml index dfca373..110e5a1 100644 --- a/ansible/playbooks/add-new-service.yml +++ b/ansible/playbooks/add-new-service.yml @@ -3,19 +3,19 @@ # - name: Install Master IOC # vars: -# ioc_service_name_lower: master +# preferred_service_name_lower: master # branch_name: "feature/add-service-{{ service_name_lower }}" # import_playbook: ../plays/ioc/ioc-install.yml # - name: Restart Master IOC # vars: -# ioc_service_name_lower: master +# preferred_service_name_lower: master # branch_name: "feature/add-service-{{ service_name_lower }}" # import_playbook: ../plays/ioc/ioc-restart.yml - name: Deploy and Restart Master Service vars: - ioc_service_name_lower: master + preferred_service_name_lower: master branch_name: "feature/add-service-{{ service_name_lower }}" import_playbook: ../plays/service/service-deploy-and-restart.yml diff --git a/ansible/plays/ioc/ioc-install.yml b/ansible/plays/ioc/ioc-install.yml index 8099450..55eda0e 100644 --- a/ansible/plays/ioc/ioc-install.yml +++ b/ansible/plays/ioc/ioc-install.yml @@ -17,46 +17,46 @@ - name: Initialize service name ansible.builtin.set_fact: - # Uses ioc_service_name_lower if defined in vars, otherwise falls back to the CLI extra-vars - service_name_lower: "{{ ioc_service_name_lower | default(service_name_lower) }}" + # Uses preferred_service_name_lower if defined in vars, otherwise falls back to the CLI extra-vars + target_service_name_lower: "{{ preferred_service_name_lower | default(service_name_lower) }}" - - name: "[{{ service_name_lower }}] Establish environment naming conventions" + - name: "[{{ target_service_name_lower }}] Establish environment naming conventions" ansible.builtin.set_fact: - service_name_upper: "{{ service_name_lower | upper }}" + service_name_upper: "{{ target_service_name_lower | upper }}" # Set suffix to "-DEV" if dev, otherwise empty "" env_suffix_upper: "{{ '-DEV' if agebd_env == 'dev' else '' }}" # Set suffix to "-dev" if dev, otherwise empty "" env_suffix_lower: "{{ '-dev' if agebd_env == 'dev' else '' }}" - - name: "[{{ service_name_lower }}] Define file paths" + - name: "[{{ target_service_name_lower }}] Define file paths" ansible.builtin.set_fact: - ioc_base_dir: "{{ workspace_dir }}/services/{{ service_name_lower }}/current/ioc" + ioc_base_dir: "{{ workspace_dir }}/services/{{ target_service_name_lower }}/current/ioc" orig_subs_name: "AGEBD-CPCL-{{ service_name_upper }}_main.subs" target_subs_name: "AGEBD-CPCL-{{ service_name_upper }}{{ env_suffix_upper }}_main.subs" orig_params_name: "AGEBD-CPCL-{{ service_name_upper }}_parameters.yaml" target_params_name: "AGEBD-CPCL-{{ service_name_upper }}{{ env_suffix_upper }}_parameters.yaml" # Rename the subs file if we are in DEV - - name: "[{{ service_name_lower }}] Rename substitution file for environment" + - name: "[{{ target_service_name_lower }}] Rename substitution file for environment" ansible.builtin.command: cmd: "mv {{ ioc_base_dir }}/{{ orig_subs_name }} {{ ioc_base_dir }}/{{ target_subs_name }}" removes: "{{ ioc_base_dir }}/{{ orig_subs_name }}" # Only runs if the original file exists # Rename the paramters file if we are in DEV - - name: "[{{ service_name_lower }}] Rename parameters file for environment" + - name: "[{{ target_service_name_lower }}] Rename parameters file for environment" ansible.builtin.command: cmd: "mv {{ ioc_base_dir }}/{{ orig_params_name }} {{ ioc_base_dir }}/{{ target_params_name }}" removes: "{{ ioc_base_dir }}/{{ orig_params_name }}" # Only runs if the original file exists # Replace {{ agebd_env }} inside the newly renamed subs file - - name: "[{{ service_name_lower }}] Substitute environment tokens inside subs file" + - name: "[{{ target_service_name_lower }}] Substitute environment tokens inside subs file" ansible.builtin.replace: path: "{{ ioc_base_dir }}/{{ target_subs_name }}" regexp: '\{\{\s*agebd_env\s*\}\}' replace: "{{ env_suffix_upper }}" # Replace {{ agebd_env }} and {{ ioc_port }} inside the newly renamed params file - - name: "[{{ service_name_lower }}] Substitute environment token inside params file" + - name: "[{{ target_service_name_lower }}] Substitute environment token inside params file" ansible.builtin.replace: path: "{{ ioc_base_dir }}/{{ target_params_name }}" regexp: "{{ item.regexp }}" @@ -65,7 +65,7 @@ - { regexp: '\{\{\s*agebd_env\s*\}\}', replace: "{{ env_suffix_lower }}" } - { regexp: '\{\{\s*ioc_port\s*\}\}', replace: "{{ ioc_port }}" } - - name: "[{{ service_name_lower }}] Run ioc install" + - name: "[{{ target_service_name_lower }}] Run ioc install" ansible.builtin.shell: cmd: "ioc install -V --facility sls --ioc AGEBD-CPCL-{{ service_name_upper }}{{ env_suffix_upper }} --clean" chdir: "{{ ioc_base_dir }}" diff --git a/ansible/plays/ioc/ioc-restart.yml b/ansible/plays/ioc/ioc-restart.yml index c6c5774..1617ce2 100644 --- a/ansible/plays/ioc/ioc-restart.yml +++ b/ansible/plays/ioc/ioc-restart.yml @@ -17,20 +17,20 @@ - name: Initialize service name ansible.builtin.set_fact: - # Uses ioc_service_name_lower if defined in vars, otherwise falls back to the CLI extra-vars - service_name_lower: "{{ ioc_service_name_lower | default(service_name_lower) }}" + # Uses preferred_service_name_lower if defined in vars, otherwise falls back to the CLI extra-vars + target_service_name_lower: "{{ preferred_service_name_lower | default(service_name_lower) }}" - - name: "[{{ service_name_lower }}] Establish environment naming conventions" + - name: "[{{ target_service_name_lower }}] Establish environment naming conventions" ansible.builtin.set_fact: - service_name_upper: "{{ service_name_lower | upper }}" + service_name_upper: "{{ target_service_name_lower | upper }}" # Set suffix to "-DEV" if dev, otherwise empty "" env_suffix_upper: "{{ '-DEV' if agebd_env == 'dev' else '' }}" - - name: "[{{ service_name_lower }}] Define file paths" + - name: "[{{ target_service_name_lower }}] Define file paths" ansible.builtin.set_fact: - ioc_base_dir: "{{ workspace_dir }}/services/{{ service_name_lower }}/current/ioc" + ioc_base_dir: "{{ workspace_dir }}/services/{{ target_service_name_lower }}/current/ioc" - - name: "[{{ service_name_lower }}] Restart IOC" + - name: "[{{ target_service_name_lower }}] Restart IOC" ansible.builtin.shell: cmd: "ioc restart AGEBD-CPCL-{{ service_name_upper }}{{ env_suffix_upper }}" chdir: "{{ ioc_base_dir }}" diff --git a/ansible/plays/ioc/ioc-start.yml b/ansible/plays/ioc/ioc-start.yml index dbee976..4555aeb 100644 --- a/ansible/plays/ioc/ioc-start.yml +++ b/ansible/plays/ioc/ioc-start.yml @@ -6,10 +6,10 @@ tasks: - name: Initialize service name ansible.builtin.set_fact: - # Uses ioc_service_name_lower if defined in vars, otherwise falls back to the CLI extra-vars - service_name_lower: "{{ ioc_service_name_lower | default(service_name_lower) }}" + # Uses preferred_service_name_lower if defined in vars, otherwise falls back to the CLI extra-vars + target_service_name_lower: "{{ preferred_service_name_lower | default(service_name_lower) }}" - - name: "[{{ service_name_lower }}] Start IOC" + - name: "[{{ target_service_name_lower }}] Start IOC" ansible.builtin.shell: | sudo shellbox start {{ ioc_port }} changed_when: true \ No newline at end of file diff --git a/ansible/plays/service/service-deploy-and-restart.yml b/ansible/plays/service/service-deploy-and-restart.yml index 6be0eae..9a49403 100644 --- a/ansible/plays/service/service-deploy-and-restart.yml +++ b/ansible/plays/service/service-deploy-and-restart.yml @@ -7,37 +7,37 @@ tasks: - name: Initialize service name ansible.builtin.set_fact: - # Uses ioc_service_name_lower if defined in vars, otherwise falls back to the CLI extra-vars - service_name_lower: "{{ ioc_service_name_lower | default(service_name_lower) }}" + # Uses preferred_service_name_lower if defined in vars, otherwise falls back to the CLI extra-vars + target_service_name_lower: "{{ preferred_service_name_lower | default(service_name_lower) }}" - - name: "[{{ service_name_lower }}] Define service specific paths and names" + - name: "[{{ target_service_name_lower }}] Define service specific paths and names" ansible.builtin.set_fact: - svc_current_dir: "/sls/bd/hla/{{ agebd_env }}/services/{{ service_name_lower }}/current" - service_unit_name: "AGEBD-SERVICE-{{ service_name_lower | upper }}.service" + svc_current_dir: "/sls/bd/hla/{{ agebd_env }}/services/{{ target_service_name_lower }}/current" + service_unit_name: "AGEBD-SERVICE-{{ target_service_name_lower | upper }}.service" - - name: "[{{ service_name_lower }}] Ensure target directory structure exists" + - name: "[{{ target_service_name_lower }}] Ensure target directory structure exists" ansible.builtin.file: path: "{{ svc_current_dir }}" state: directory # ansible.builtin.shell: | # mkdir -p "{{ svc_current_dir }}" - - name: "[{{ service_name_lower }}] Sync service deployment files" + - name: "[{{ target_service_name_lower }}] Sync service deployment files" ansible.builtin.copy: - src: "{{ playbook_dir }}/../../../services/{{ service_name_lower }}/current/" + src: "{{ playbook_dir }}/../../../services/{{ target_service_name_lower }}/current/" dest: "{{ svc_current_dir }}/" mode: 'preserve' # ansible.builtin.shell: | - # cp -r "{{ repo_root }}/services/{{ service_name_lower }}/current/" "{{ svc_current_dir }}" + # cp -r "{{ repo_root }}/services/{{ target_service_name_lower }}/current/" "{{ svc_current_dir }}" - - name: "[{{ service_name_lower }}] Substitute environment variable inline" + - name: "[{{ target_service_name_lower }}] Substitute environment variable inline" ansible.builtin.replace: path: "{{ svc_current_dir }}/systemd/{{ service_unit_name }}" regexp: '\{\{\s*agebd_env\s*\}\}' replace: "{{ agebd_env }}" # systemctl --user link --force "./{{ service_unit_name }}" - - name: "[{{ service_name_lower }}] Symlink systemd unit file (Absolute Path)" + - name: "[{{ target_service_name_lower }}] Symlink systemd unit file (Absolute Path)" ansible.builtin.file: src: "{{ svc_current_dir }}/systemd/{{ service_unit_name }}" dest: "~/.config/systemd/user/{{ service_unit_name }}" @@ -48,7 +48,7 @@ # systemctl --user daemon-reload # systemctl --user enable "{{ service_unit_name }}" # systemctl --user restart "{{ service_unit_name }}" - - name: "[{{ service_name_lower }}] Enable and Restart Systemd Service" + - name: "[{{ target_service_name_lower }}] Enable and Restart Systemd Service" ansible.builtin.systemd_service: name: "{{ service_unit_name }}" scope: user