Skip to content

Commit

Permalink
Merge pull request oravirt#101 from Rendanic/prcollection2
Browse files Browse the repository at this point in the history
More fixes for Collection and less verbose with loop labels
  • Loading branch information
Rendanic authored Jul 8, 2022
2 parents 58affe2 + 13cf9b9 commit 28f7264
Show file tree
Hide file tree
Showing 28 changed files with 19 additions and 1 deletion.
5 changes: 4 additions & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
---
namespace: opitzconsulting
name: ansible_oracle
description: This is the collection of ansible-oracle from Branch oc on https://github.com/opitzconsulting/ansible-oracle
description: "This is the collection of ansible-oracle from Branch oc on https://github.com/opitzconsulting/ansible-oracle"
version: 3.0.0
repository: https://github.com/opitzconsulting/ansible-oracle.git
readme: README.md
authors:
- Mikael Sandström
- OPITZ CONSULTING
- Thorsten Bruhns
license:
- "MIT"
tags:
- oracle
2 changes: 2 additions & 0 deletions meta/runtime.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
requires_ansible: '>=2.9.10'
Empty file added roles/README.md
Empty file.
Empty file added roles/common/README.md
Empty file.
Empty file added roles/cxoracle/README.md
Empty file.
1 change: 1 addition & 0 deletions roles/oradb_manage_db/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
with_items: "{{ oracle_databases }}"
loop_control:
loop_var: dbh
label: "create_listener {{ create_listener | default('') }} oracle_home {{ dbh.home | default('') }}"
tags: set_fact

- include_tasks: sqlnet.yml
Expand Down
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
12 changes: 12 additions & 0 deletions roles/oradb_rman/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
with_together:
- "{{ oracle_databases }}"
- ""
loop_control:
label: "oracle_db_name {{ item.0.oracle_db_name | default('') }}"
tags:
- rmancopy

Expand All @@ -54,6 +56,8 @@
with_together:
- "{{ oracle_databases }}"
- ""
loop_control:
label: "oracle_db_name {{ item.0.oracle_db_name | default('') }}"
tags:
- rmancopy

Expand All @@ -69,6 +73,8 @@
- "{{ oracle_databases }}"
- rman_jobs
- skip_missing: true
loop_control:
label: "oracle_db_name {{ item.0.oracle_db_name | default('') }} job {{ item.1.name | default('') }}"
tags:
- rmancopy

Expand Down Expand Up @@ -138,6 +144,8 @@
- "{{ oracle_databases }}"
- rman_jobs
- skip_missing: true
loop_control:
label: "oracle_db_name {{ item.0.oracle_db_name | default('') }} job {{ item.1.name | default('') }}"
when: item.1.immediate is defined and item.1.immediate
and ( (configure_cluster and inventory_hostname == cluster_master)
or not configure_cluster
Expand All @@ -148,6 +156,8 @@
- ansible.builtin.debug: msg={{ item.results.stdout_lines | default("") }} # noqa unnamed-task
with_items:
- "{{ rmanexecimmediate }}"
loop_control:
label: ""
when: rmanexecimmediate is defined
tags:
- rmanexecute
Expand Down Expand Up @@ -182,6 +192,8 @@
- "{{ oracle_databases }}"
- rman_jobs
- skip_missing: true
loop_control:
label: "oracle_db_name {{ item.0.oracle_db_name | default('') }} job {{ item.1.name | default('') }}"
when:
- item.1 is defined
- item.1.disabled is defined
Expand Down
Empty file.
Empty file added roles/orahost/README.md
Empty file.
Empty file added roles/orahost_storage/README.md
Empty file.
Empty file added roles/orasw_meta/README.md
Empty file.
Empty file.
Empty file.
Empty file added roles/oraswdb_install/README.md
Empty file.
Empty file.
Empty file.
Empty file added roles/oraswgi_install/README.md
Empty file.
Empty file.
Empty file added roles/oraswgi_opatch/README.md
Empty file.

0 comments on commit 28f7264

Please sign in to comment.