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.

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

Changed vars from list to dictionaries in playbooks #5710

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions playbooks/Gitlab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
remote_user: pulsys
become: true
vars:
- post_install: |
Things left to do:
- comment out `AllowUsers pulsys` as `/etc/ssh/sshd_config`
- Restart the openssh-server `sudo systemctl restart sshd`
post_install: |
Things left to do:
- comment out `AllowUsers pulsys` as `/etc/ssh/sshd_config`
- Restart the openssh-server `sudo systemctl restart sshd`
vars_files:
- ../group_vars/gitlab/{{ runtime_env | default('staging') }}.yml
- ../group_vars/gitlab/vault.yml
Expand Down
4 changes: 2 additions & 2 deletions playbooks/aws_group_access.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
hosts: localhost
gather_facts: false
vars:
- pul_user: "{{ pul_group }}"
- dev_user: "{{ dev_user }}"
pul_user: "{{ pul_group }}"
dev_user: "{{ dev_user }}"
tasks:
- name: check for "{{ pul_group }}"
community.aws.iam_access_key_info:
Expand Down
12 changes: 6 additions & 6 deletions playbooks/byzantine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
remote_user: pulsys
become: true
vars:
- force_settings: true
- drupal_git_repo: ''
- post_install: |
Possible Things left to do:
- run a cap for byzantine
- where needed, make sure server is greenlisted on [lib-ponyexpress](https://github.com/pulibrary/pul-the-hard-way/blob/master/services/smtp-mail-server.md)
force_settings: true
drupal_git_repo: ''
post_install: |
Possible Things left to do:
- run a cap for byzantine
- where needed, make sure server is greenlisted on [lib-ponyexpress](https://github.com/pulibrary/pul-the-hard-way/blob/master/services/smtp-mail-server.md)
vars_files:
- ../group_vars/byzantine/common.yml
- ../group_vars/byzantine/{{ runtime_env | default('staging') }}.yml
Expand Down
6 changes: 3 additions & 3 deletions playbooks/ezproxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
remote_user: pulsys
become: true
vars:
- post_install: |
Possible Things left to do:
- run a cap for ezproxy
post_install: |
Possible Things left to do:
- run a cap for ezproxy
vars_files:
- ../group_vars/ezproxy/{{ runtime_env | default('testing') }}.yml
- ../group_vars/ezproxy/vault.yml
Expand Down
8 changes: 4 additions & 4 deletions playbooks/figgy_db_migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
# where leader_db_host is defined for all pgsql machines
# to the vars_files: section
vars:
- deploy_user: "pulsys"
- file_path: "/mnt/diglibdata1/postgreslog/migrate"
- dest_file_path: "/var/lib/migrate"
- backup_time: "{{ ansible_date_time.date }}"
deploy_user: "pulsys"
file_path: "/mnt/diglibdata1/postgreslog/migrate"
dest_file_path: "/var/lib/migrate"
backup_time: "{{ ansible_date_time.date }}"
vars_files:
- ../group_vars/{{ project_name }}/{{ app_runtime_env | default(runtime_env) | default('staging') }}.yml
# - ../group_vars/{{ project_name }}/main.yml # some roles have this
Expand Down
12 changes: 6 additions & 6 deletions playbooks/friends_of_pul.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
remote_user: pulsys
become: true
vars:
- force_settings: true
- drupal_git_repo: ''
- post_install: |
Possible Things left to do:
- run a cap for friends_of_pul
- where needed make sure server is greenlisted on [lib-ponyexpress](https://github.com/pulibrary/pul-the-hard-way/blob/master/services/smtp-mail-server.md)
force_settings: true
drupal_git_repo: ''
post_install: |
Possible Things left to do:
- run a cap for friends_of_pul
- where needed make sure server is greenlisted on [lib-ponyexpress](https://github.com/pulibrary/pul-the-hard-way/blob/master/services/smtp-mail-server.md)
vars_files:
- ../group_vars/friends_of_pul/{{ runtime_env | default('staging') }}.yml
- ../group_vars/friends_of_pul/common.yml
Expand Down
2 changes: 1 addition & 1 deletion playbooks/lib_jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
remote_user: pulsys
become: true
vars:
- post_install: |
post_install: |
Possible Things left to do:
- deploy lib_jobs and aspace_helpers
vars_files:
Expand Down
8 changes: 4 additions & 4 deletions playbooks/lib_sftp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
remote_user: pulsys
become: true
vars:
- force_settings: true
- drupal_git_repo: ''
- post_install: |
Look the README for additional steps to allow mkhome directory
force_settings: true
drupal_git_repo: ''
post_install: |
Look the README for additional steps to allow mkhome directory

pre_tasks:
- set_fact:
Expand Down
2 changes: 1 addition & 1 deletion playbooks/libruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
remote_user: pulsys
become: true
vars:
- ignore_error: true
ignore_error: true
vars_files:
roles:
- role: deploy_user
Expand Down
6 changes: 3 additions & 3 deletions playbooks/libwww.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
remote_user: pulsys
become: true
vars:
- force_settings: true
- drupal_git_repo: ''
- post_install: |
force_settings: true
drupal_git_repo: ''
post_install: |
Possible Things left to do:
- run a cap for pul_library_drupal, discoveryutils
- where needed make sure server is greenlisted on [lib-ponyexpress](https://github.com/pulibrary/pul-the-hard-way/blob/master/services/smtp-mail-server.md)
Expand Down
6 changes: 3 additions & 3 deletions playbooks/mysql_db_migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
remote_user: pulsys
become: true
vars:
- deploy_user: "pulsys"
- file_path: "/var/lib/migrate"
- now: "{{ ansible_date_time.date }}"
deploy_user: "pulsys"
file_path: "/var/lib/migrate"
now: "{{ ansible_date_time.date }}"
vars_files:
- ../group_vars/{{ project_name }}/{{ runtime_env | default('staging') }}.yml
- ../group_vars/{{ project_name }}/common.yml
Expand Down
4 changes: 2 additions & 2 deletions playbooks/orangelight_toggle_readonly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
remote_user: pulsys
become: true
vars:
- deploy_user: "deploy"
- rails_app_name: "orangelight"
deploy_user: "deploy"
rails_app_name: "orangelight"
vars_files:
- ../site_vars.yml
- ../group_vars/orangelight/vault.yml
Expand Down
6 changes: 3 additions & 3 deletions playbooks/orcid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
- ../group_vars/orcid/vault.yml

vars:
- post_install: |
Possible Things left to do:
- run a cap deploy for orcid: https://github.com/pulibrary/orcid_princeton
post_install: |
Possible Things left to do:
- run a cap deploy for orcid: https://github.com/pulibrary/orcid_princeton

roles:
- role: roles/rails_app
Expand Down
2 changes: 1 addition & 1 deletion playbooks/pas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
- ../group_vars/pas/vault.yml
- ../group_vars/nfsserver/common.yml
vars:
- pas_upload_path: 'pas/pas-production'
pas_upload_path: 'pas/pas-production'
roles:
- role: nfsserver
- role: roles/pas
Expand Down
6 changes: 3 additions & 3 deletions playbooks/pdc_describe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
- ../group_vars/pdc_describe/vault.yml

vars:
- post_install: |
Possible Things left to do:
- run a cap deploy for pdc_describe: https://github.com/pulibrary/pdc_describe
post_install: |
Possible Things left to do:
- run a cap deploy for pdc_describe: https://github.com/pulibrary/pdc_describe

roles:
- role: roles/mailcatcher
Expand Down
6 changes: 3 additions & 3 deletions playbooks/pdc_discovery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
- ../group_vars/pdc_discovery/vault.yml

vars:
- post_install: |
Possible Things left to do:
- run a cap deploy for pdc_discovery: https://github.com/pulibrary/pdc_discovery
post_install: |
Possible Things left to do:
- run a cap deploy for pdc_discovery: https://github.com/pulibrary/pdc_discovery

roles:
- role: roles/mailcatcher
Expand Down
6 changes: 3 additions & 3 deletions playbooks/postgresql_db_migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
# where leader_db_host is defined for all pgsql machines
# to the vars_files: section
vars:
- deploy_user: "pulsys"
- file_path: "/var/lib/migrate"
- now: "{{ ansible_date_time.date }}"
deploy_user: "pulsys"
file_path: "/var/lib/migrate"
now: "{{ ansible_date_time.date }}"
vars_files:
- ../group_vars/{{ project_name }}/{{ app_runtime_env | default(runtime_env) | default('staging') }}.yml
# - ../group_vars/{{ project_name }}/main.yml # some roles have this
Expand Down
4 changes: 2 additions & 2 deletions playbooks/recap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
- ../group_vars/nfsserver/common.yml
- ../group_vars/recap/vault.yml
vars:
- force_settings: true
- drupal_git_repo: ''
force_settings: true
drupal_git_repo: ''
roles:
- role: nfsserver
- role: datadog
Expand Down
12 changes: 6 additions & 6 deletions playbooks/special_collections.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
remote_user: pulsys
become: true
vars:
- force_settings: true
- drupal_git_repo: ''
- post_install: |
Possible Things left to do:
- run a cap for special_collections
- where needed make sure server is greenlisted on [lib-ponyexpress](https://github.com/pulibrary/pul-the-hard-way/blob/master/services/smtp-mail-server.md)
force_settings: true
drupal_git_repo: ''
post_install: |
Possible Things left to do:
- run a cap for special_collections
- where needed make sure server is greenlisted on [lib-ponyexpress](https://github.com/pulibrary/pul-the-hard-way/blob/master/services/smtp-mail-server.md)
vars_files:
- ../group_vars/special_collections/{{ runtime_env | default('staging') }}.yml
- ../group_vars/special_collections/common.yml
Expand Down
6 changes: 3 additions & 3 deletions playbooks/video_reserves.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
remote_user: pulsys
become: true
vars:
- post_install: |
Possible Things left to do:
- run a cap for video_reserves
post_install: |
Possible Things left to do:
- run a cap for video_reserves
vars_files:
- ../group_vars/video_reserves/{{ runtime_env | default('staging') }}.yml
pre_tasks:
Expand Down
6 changes: 3 additions & 3 deletions playbooks/whichiso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
- ../group_vars/whichiso/vault.yml

vars:
- post_install: |
Possible Things left to do:
- run a cap deploy for whichiso: https://github.com/pulibrary/whichiso
post_install: |
Possible Things left to do:
- run a cap deploy for whichiso: https://github.com/pulibrary/whichiso

roles:
- role: roles/rails_app
Expand Down
Loading