Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix order of roles to fix dependency over notifications #44

Merged
merged 1 commit into from
Jan 26, 2024
Merged

Fix order of roles to fix dependency over notifications #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions playbooks/controller_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
ansible.builtin.include_role:
name: infra.controller_configuration.organizations
vars:
assign_galaxy_credentials_to_org: false

Check warning on line 17 in playbooks/controller_config.yml

View workflow job for this annotation

GitHub Actions / build

var-naming[no-role-prefix] 

Variables names from within roles should use organizations_ as a prefix. (vars: assign_default_ee_to_org)

Check warning on line 17 in playbooks/controller_config.yml

View workflow job for this annotation

GitHub Actions / build

var-naming[no-role-prefix] 

Variables names from within roles should use organizations_ as a prefix. (vars: assign_galaxy_credentials_to_org)
assign_default_ee_to_org: false
when: controller_organizations | length is not match('0')

Expand All @@ -27,7 +27,7 @@
ansible.builtin.include_role:
name: infra.controller_configuration.users
vars:
controller_configuration_users_secure_logging: true

Check warning on line 30 in playbooks/controller_config.yml

View workflow job for this annotation

GitHub Actions / build

var-naming[no-role-prefix] 

Variables names from within roles should use users_ as a prefix. (vars: controller_configuration_users_secure_logging)
when: controller_user_accounts | length is not match('0')

- name: Include teams role
Expand Down Expand Up @@ -64,7 +64,7 @@
ansible.builtin.include_role:
name: infra.controller_configuration.credentials
vars:
controller_configuration_credentials_secure_logging: true

Check warning on line 67 in playbooks/controller_config.yml

View workflow job for this annotation

GitHub Actions / build

var-naming[no-role-prefix] 

Variables names from within roles should use credentials_ as a prefix. (vars: controller_configuration_credentials_secure_logging)
when: controller_credentials | length is not match('0')

- name: Include credential_input_sources role
Expand All @@ -87,6 +87,11 @@
name: infra.controller_configuration.organizations
when: controller_organizations | length is not match('0')

- name: Include Notification role
ansible.builtin.include_role:
name: infra.controller_configuration.notification_templates
when: controller_notifications | length is not match('0')

- name: Include projects role
ansible.builtin.include_role:
name: infra.controller_configuration.projects
Expand Down Expand Up @@ -136,11 +141,6 @@
name: infra.controller_configuration.schedules
when: controller_schedules | length is not match('0')

- name: Include Notification role
ansible.builtin.include_role:
name: infra.controller_configuration.notification_templates
when: controller_notifications | length is not match('0')

- name: Include roles role
ansible.builtin.include_role:
name: infra.controller_configuration.roles
Expand Down
10 changes: 5 additions & 5 deletions playbooks/install_configure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,11 @@
name: infra.controller_configuration.organizations
when: controller_organizations | length is not match('0')

- name: Include Notification role
ansible.builtin.include_role:
name: infra.controller_configuration.notification_templates
when: controller_notifications | length is not match('0')

- name: Include projects role
ansible.builtin.include_role:
name: infra.controller_configuration.projects
Expand Down Expand Up @@ -211,11 +216,6 @@
name: infra.controller_configuration.schedules
when: controller_schedules | length is not match('0')

- name: Include Notification role
ansible.builtin.include_role:
name: infra.controller_configuration.notification_templates
when: controller_notifications | length is not match('0')

- name: Include roles role
ansible.builtin.include_role:
name: infra.controller_configuration.roles
Expand Down
Loading