Skip to content

bug: extra indents in yaml blocks produce unwanted newlines #420

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

Merged
merged 2 commits into from
Mar 21, 2024
Merged

bug: extra indents in yaml blocks produce unwanted newlines #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d54605b
extra indents in yamkl blocks produce unwanted newlines
bartowl Mar 8, 2024
fe8285c
antsibull
bartowl Mar 8, 2024
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
3 changes: 3 additions & 0 deletions changelogs/fragments/420_yaml_indents.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
bugfixes:
- "oradb_rman: Removed unwanted newlines from rman_backup.sh command line (oravirt#420)"
- "reviewed entire roles/ code basis and removed unwanted indents from yaml multiline blocks (oravirt#420)"
8 changes: 4 additions & 4 deletions roles/oradb_rman/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,10 @@
# noqa risky-shell-pipe no-changed-when
ansible.builtin.shell: >-
{{ oracle_base }}/bin/rman_backup.sh
-a {{ odb.1.name }}
-s {{ odb.0.oracle_db_instance_name | default(odb.0.oracle_db_name) }}
-r {{ oradb_rman_script_dir }}
-l {{ oradb_rman_log_dir }} | tee -a {{ rman_cron_logdir }}/rman_{{ odb.1.name }}.log
-a {{ odb.1.name }}
-s {{ odb.0.oracle_db_instance_name | default(odb.0.oracle_db_name) }}
-r {{ oradb_rman_script_dir }}
-l {{ oradb_rman_log_dir }} | tee -a {{ rman_cron_logdir }}/rman_{{ odb.1.name }}.log
environment:
PATH: /bin:/usr/bin
become: true
Expand Down
12 changes: 6 additions & 6 deletions roles/orasw_meta/tasks/assert_oracle_sw_patches.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
- osp_loop.filename is defined
- >-
oracle_sw_patches
| selectattr('unique_patchid', 'defined')
| selectattr('unique_patchid', 'equalto', osp_loop.unique_patchid | default(0))
| list | length <= 1
| selectattr('unique_patchid', 'defined')
| selectattr('unique_patchid', 'equalto', osp_loop.unique_patchid | default(0))
| list | length <= 1
- >-
oracle_sw_patches
| selectattr('unique_patchid', 'undefined')
| selectattr('patchid', 'equalto', osp_loop.patchid)
| list | length <= 1
| selectattr('unique_patchid', 'undefined')
| selectattr('patchid', 'equalto', osp_loop.patchid)
| list | length <= 1
with_items:
- "{{ oracle_sw_patches }}"
loop_control:
Expand Down
2 changes: 1 addition & 1 deletion roles/oraswgi_manage_patches/tasks/post_install_patch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
with_items:
- >-
gi_patches[oracle_install_version_gi]['opatch']
| selectattr('state', 'equalto', 'present')
| selectattr('state', 'equalto', 'present')
- "" # loop with dummy list due to needed structure for autopatch
loop_control:
loop_var: gip_opatch
Expand Down