Skip to content

Commit

Permalink
Rename yaml references to yml
Browse files Browse the repository at this point in the history
  • Loading branch information
steven-schattenberg-itential committed Aug 13, 2024
1 parent 51b43da commit 257829d
Show file tree
Hide file tree
Showing 23 changed files with 54 additions and 54 deletions.
4 changes: 2 additions & 2 deletions roles/gateway/tasks/download-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
ansible.builtin.include_vars:
file: "{{ item }}"
with_first_found:
- "{{ iag_release }}-{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version }}.yaml"
- "release-undefined.yaml"
- "{{ iag_release }}-{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version }}.yml"
- "release-undefined.yml"

- name: Check for valid IAG release
ansible.builtin.fail:
Expand Down
24 changes: 12 additions & 12 deletions roles/gateway/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
ansible.builtin.include_vars:
file: "{{ item }}"
with_first_found:
- "{{ iag_release }}-{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version }}.yaml"
- "release-undefined.yaml"
- "{{ iag_release }}-{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version }}.yml"
- "release-undefined.yml"

- name: Check for valid IAG release
ansible.builtin.fail:
Expand Down Expand Up @@ -149,7 +149,7 @@
name: "{{ workingdir.path }}/{{ iag_whl_file | basename }}"
virtualenv: "{{ iag_install_dir }}/venv"

- name: Set ownership/permissions and create properties.yaml
- name: Set ownership/permissions and create properties.yml
when: not iag_installed.stat.exists
block:
# Using chown and chmod is a faster way to enforce the file ownership and
Expand All @@ -165,10 +165,10 @@
cmd: "chmod -R 775 {{ iag_install_dir }}/venv"
changed_when: true

- name: Create properties.yaml using template based on the version
- name: Create properties.yml using template based on the version
ansible.builtin.template:
src: "properties.{{ iag_release }}.yaml.j2"
dest: "{{ iag_properties_location }}/properties.yaml"
src: "properties.{{ iag_release }}.yml.j2"
dest: "{{ iag_properties_location }}/properties.yml"
owner: "{{ iag_user }}"
group: "{{ iag_group }}"
mode: "0660"
Expand All @@ -184,14 +184,14 @@
mode: "0660"
state: touch
with_items:
- "{{ iag_install_dir }}/nornir/inventory/defaults.yaml"
- "{{ iag_install_dir }}/nornir/inventory/groups.yaml"
- "{{ iag_install_dir }}/nornir/inventory/hosts.yaml"
- "{{ iag_install_dir }}/nornir/inventory/defaults.yml"
- "{{ iag_install_dir }}/nornir/inventory/groups.yml"
- "{{ iag_install_dir }}/nornir/inventory/hosts.yml"

- name: Create Nornir config file
ansible.builtin.template:
src: nornir.config.yaml.j2
dest: "{{ iag_install_dir }}/nornir/config.yaml"
src: nornir.config.yml.j2
dest: "{{ iag_install_dir }}/nornir/config.yml"
owner: "{{ iag_user }}"
group: "{{ iag_group }}"
mode: "0660"
Expand Down Expand Up @@ -247,7 +247,7 @@

- name: Update release file
ansible.builtin.include_tasks:
file: update-release-file.yaml
file: update-release-file.yml

- name: Remove temporary working directory
ansible.builtin.file:
Expand Down
2 changes: 1 addition & 1 deletion roles/gateway/templates/automation-gateway.service.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ After=network.target
User=itential
Restart=always
Type=simple
ExecStart={{ python_venv }}/bin/automation-gateway --properties-file={{ iag_properties_location }}/properties.yaml
ExecStart={{ python_venv }}/bin/automation-gateway --properties-file={{ iag_properties_location }}/properties.yml
WorkingDirectory=/tmp
Environment=MAX_EVENT_RES=15000000
Environment=PATH={{ python_venv }}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ logging:
inventory:
plugin: SimpleInventory
options:
host_file: "{{ iag_install_dir }}/nornir/inventory/hosts.yaml"
group_file: "{{ iag_install_dir }}/nornir/inventory/groups.yaml"
defaults_file: "{{ iag_install_dir }}/nornir/inventory/defaults.yaml"
host_file: "{{ iag_install_dir }}/nornir/inventory/hosts.yml"
group_file: "{{ iag_install_dir }}/nornir/inventory/groups.yml"
defaults_file: "{{ iag_install_dir }}/nornir/inventory/defaults.yml"
runner:
plugin: threaded
options:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ nornir_enabled: {{ iag_enable_nornir }}

# Path to the Nornir configuration file.
# A valid file will allows the use of Nornir External inventory.
#nornir_config_file: "{{ iag_install_dir }}/nornir/config.yaml"
#nornir_config_file: "{{ iag_install_dir }}/nornir/config.yml"

# Discovery behavior for Nornir modules. Determines whether or not to
# recursively search the directories found in the 'nornir_module_path' parameter, or
Expand Down Expand Up @@ -198,7 +198,7 @@ script_path:
#############
# Terraform #
#############
# Terraform was removed due to HashiCorp adopting the
# Terraform was removed due to HashiCorp adopting the
# Business Source License (BSL) for their core products

# A boolean flag that enables Terraform support (default=false if absent/misconfigured).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ nornir_enabled: {{ iag_enable_nornir }}

# Path to the Nornir configuration file.
# A valid file will allows the use of Nornir External inventory.
nornir_config_file: "{{ iag_install_dir }}/nornir/config.yaml"
nornir_config_file: "{{ iag_install_dir }}/nornir/config.yml"

# Discovery behavior for Nornir modules. Determines whether or not to
# recursively search the directories found in the 'nornir_module_path' parameter, or
Expand Down Expand Up @@ -216,7 +216,7 @@ script_path:
#############
# Terraform #
#############
# Terraform was removed due to HashiCorp adopting the
# Terraform was removed due to HashiCorp adopting the
# Business Source License (BSL) for their core products

# A boolean flag that enables Terraform support (default=false if absent/misconfigured).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ nornir_enabled: {{ iag_enable_nornir }}

# Path to the Nornir configuration file.
# A valid file will allows the use of Nornir External inventory.
nornir_config_file: "{{ iag_install_dir }}/nornir/config.yaml"
nornir_config_file: "{{ iag_install_dir }}/nornir/config.yml"

# Discovery behavior for Nornir modules. Determines whether or not to
# recursively search the directories found in the 'nornir_module_path' parameter, or
Expand Down Expand Up @@ -215,7 +215,7 @@ script_path:
#############
# Terraform #
#############
# Terraform was removed due to HashiCorp adopting the
# Terraform was removed due to HashiCorp adopting the
# Business Source License (BSL) for their core products

# A boolean flag that enables Terraform support (default=false if absent/misconfigured).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ nornir_enabled: {{ iag_enable_nornir }}

# Path to the Nornir configuration file.
# A valid file will allows the use of Nornir External inventory.
nornir_config_file: "{{ iag_install_dir }}/nornir/config.yaml"
nornir_config_file: "{{ iag_install_dir }}/nornir/config.yml"

# Discovery behavior for Nornir modules. Determines whether or not to
# recursively search the directories found in the 'nornir_module_path' parameter, or
Expand Down Expand Up @@ -336,7 +336,7 @@ script_path:
#############
# Terraform #
#############
# Terraform was removed due to HashiCorp adopting the
# Terraform was removed due to HashiCorp adopting the
# Business Source License (BSL) for their core products

# A boolean flag that enables Terraform support (default=false if absent/misconfigured).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ nornir_enabled: {{ iag_enable_nornir }}

# Path to the Nornir configuration file.
# A valid file will allows the use of Nornir External inventory.
nornir_config_file: "{{ iag_install_dir }}/nornir/config.yaml"
nornir_config_file: "{{ iag_install_dir }}/nornir/config.yml"

# Discovery behavior for Nornir modules. Determines whether or not to
# recursively search the directories found in the 'nornir_module_path' parameter, or
Expand Down Expand Up @@ -354,7 +354,7 @@ grpc_enabled: {{ iag_enable_grpc }}
#############
# Terraform #
#############
# Terraform was removed due to HashiCorp adopting the
# Terraform was removed due to HashiCorp adopting the
# Business Source License (BSL) for their core products

# A boolean flag that enables Terraform support (default=false if absent/misconfigured).
Expand Down
4 changes: 2 additions & 2 deletions roles/mongodb/tasks/download-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
ansible.builtin.include_vars:
file: "{{ item }}"
with_first_found:
- "{{ iap_release }}-{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version }}.yaml"
- "release-undefined.yaml"
- "{{ iap_release }}-{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version }}.yml"
- "release-undefined.yml"

- name: Check for valid MongoDB release
ansible.builtin.fail:
Expand Down
4 changes: 2 additions & 2 deletions roles/mongodb/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
ansible.builtin.include_vars:
file: "{{ item }}"
with_first_found:
- "{{ iap_release }}-{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version }}.yaml"
- "release-undefined.yaml"
- "{{ iap_release }}-{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version }}.yml"
- "release-undefined.yml"
tags: always

- name: Check for valid MongoDB release
Expand Down
2 changes: 1 addition & 1 deletion roles/offline/tasks/download-adapters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

- name: Download adapter
ansible.builtin.include_tasks:
file: download-adapter.yaml
file: download-adapter.yml
loop: "{{ adapters }}"
loop_control:
loop_var: adapter
2 changes: 1 addition & 1 deletion roles/offline/tasks/install-wheels-archives.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
register: wheel_archive_list

- name: Install wheel archive
ansible.builtin.include_tasks: "install-wheels-archive.yaml"
ansible.builtin.include_tasks: "install-wheels-archive.yml"
loop: "{{ wheel_archive_list.files }}"
loop_control:
loop_var: wheels_archive
Expand Down
4 changes: 2 additions & 2 deletions roles/os/tasks/download-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
ansible.builtin.include_vars:
file: "{{ item }}"
with_first_found:
- "release-{{ ansible_distribution_major_version }}.yaml"
- "release-undefined.yaml"
- "release-{{ ansible_distribution_major_version }}.yml"
- "release-undefined.yml"

- name: Check supported OS
ansible.builtin.fail:
Expand Down
2 changes: 1 addition & 1 deletion roles/os/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
when: ansible_os_family.lower() not in ('redhat',)

- name: Include OS specific tasks
ansible.builtin.include_tasks: "{{ ansible_os_family.lower() }}.yaml"
ansible.builtin.include_tasks: "{{ ansible_os_family.lower() }}.yml"
when: not release_file.stat.exists
8 changes: 4 additions & 4 deletions roles/os/tasks/redhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
ansible.builtin.include_vars:
file: "{{ item }}"
with_first_found:
- "release-{{ ansible_distribution_major_version }}.yaml"
- "release-undefined.yaml"
- "release-{{ ansible_distribution_major_version }}.yml"
- "release-undefined.yml"

- name: Check supported OS
ansible.builtin.fail:
msg: "Deployer does not support installing on OS version {{ ansible_distribution_major_version }}!"
when: invalid_os_release is defined

- name: Include OS specific tasks (online)
ansible.builtin.include_tasks: "{{ ansible_os_family.lower() }}-online.yaml"
ansible.builtin.include_tasks: "{{ ansible_os_family.lower() }}-online.yml"
when:
- not release_file.stat.exists
- not offline_install

- name: Include OS specific tasks (offline)
ansible.builtin.include_tasks: "{{ ansible_os_family.lower() }}-offline.yaml"
ansible.builtin.include_tasks: "{{ ansible_os_family.lower() }}-offline.yml"
when:
- not release_file.stat.exists
- offline_install
2 changes: 1 addition & 1 deletion roles/platform/tasks/determine-release-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
file: "{{ item }}"
with_first_found:
- "{{ iap_release }}-{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version }}.yml"
- "release-undefined.yaml"
- "release-undefined.yml"

- name: Check for valid IAP release
ansible.builtin.fail:
Expand Down
2 changes: 1 addition & 1 deletion roles/platform/tasks/mongo-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# Create a default profile document in the itential database. This template
# contains the logic to modify various properties based on the vars set in
# install.yaml. For example, it will correctly configure a Redis HA cluster
# install.yml. For example, it will correctly configure a Redis HA cluster
# using Redis Sentinel and also other settings.
- name: Create Local AAA profile document for standard non-production environments
ansible.builtin.template:
Expand Down
4 changes: 2 additions & 2 deletions roles/rabbitmq/tasks/download-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
ansible.builtin.include_vars:
file: "{{ item }}"
with_first_found:
- "release-{{ iap_release }}.yaml"
- "release-undefined.yaml"
- "release-{{ iap_release }}.yml"
- "release-undefined.yml"

- name: Check for valid RabbitMQ release
ansible.builtin.fail:
Expand Down
4 changes: 2 additions & 2 deletions roles/rabbitmq/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
ansible.builtin.include_vars:
file: "{{ item }}"
with_first_found:
- "release-{{ iap_release }}.yaml"
- "release-undefined.yaml"
- "release-{{ iap_release }}.yml"
- "release-undefined.yml"

- name: Check for valid RabbitMQ release
ansible.builtin.fail:
Expand Down
4 changes: 2 additions & 2 deletions roles/redis/tasks/download-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
ansible.builtin.include_vars:
file: "{{ item }}"
with_first_found:
- "release-{{ iap_release }}.yaml"
- "release-undefined.yaml"
- "release-{{ iap_release }}.yml"
- "release-undefined.yml"

- name: Check for valid Redis release
ansible.builtin.fail:
Expand Down
8 changes: 4 additions & 4 deletions roles/redis/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
ansible.builtin.include_vars:
file: "{{ item }}"
with_first_found:
- "release-{{ iap_release }}.yaml"
- "release-undefined.yaml"
- "release-{{ iap_release }}.yml"
- "release-undefined.yml"

- name: Check for valid Redis release
ansible.builtin.fail:
Expand All @@ -32,13 +32,13 @@
block:
- name: Include tasks to install Redis using Remi repo (online)
ansible.builtin.include_tasks:
file: redis-using-remi-repo.yaml
file: redis-using-remi-repo.yml
when:
- redis_install_method == "remi_repo"

- name: Include tasks to install Redis using source
ansible.builtin.include_tasks:
file: redis-using-source.yaml
file: redis-using-source.yml
when: redis_install_method == "source"

- name: Include tasks to install Redis (offline)
Expand Down
2 changes: 1 addition & 1 deletion roles/redis/tasks/redis-offline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@

- name: Include tasks to install Redis from source
ansible.builtin.include_tasks:
file: redis-using-source.yaml
file: redis-using-source.yml
when: redis_install_method == "source"

0 comments on commit 257829d

Please sign in to comment.