Skip to content
Merged
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
3 changes: 3 additions & 0 deletions changelogs/fragments/scripts-folder-configurable.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
minor_changes:
- "oradb_manage_db: make hard coded folder .Scripts configurable"
11 changes: 11 additions & 0 deletions roles/common/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ sets up the host generic stuff
- [ntp_type](#ntp_type)
- [ol6_repo_file](#ol6_repo_file)
- [ol7_repo_file](#ol7_repo_file)
- [scripts_folder](#scripts_folder)
- [Discovered Tags](#discovered-tags)
- [Dependencies](#dependencies)
- [License](#license)
Expand Down Expand Up @@ -394,6 +395,16 @@ The variable is used to cleanup the yum repolist for old installations.
ol7_repo_file: public-yum-ol7.repo
```

### scripts_folder

Folder under Oracle user home dir to place scripts in

#### Default value

```YAML
scripts_folder: .Scripts
```

## Discovered Tags

**_common_assert_**
Expand Down
3 changes: 3 additions & 0 deletions roles/common/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ configure_public_yum_repo: true
# @var configure_motd:description: Configure Message of the day
configure_motd: true

# @var scripts_folder:description: Folder under Oracle user home dir to place scripts in
scripts_folder: .Scripts

# @var motd_template:description: Used templatename for Message of the day
motd_template: motd.j2

Expand Down
4 changes: 3 additions & 1 deletion roles/oradb_manage_db/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,13 @@
- name: manage_db | Add change-pdb script
ansible.builtin.template:
src: pdb.sql.j2
dest: "{{ oracle_user_home }}/.Scripts/chpdb.sql"
dest: "{{ oracle_user_home }}/{{ scripts_folder }}/chpdb.sql"
owner: "{{ oracle_user }}"
group: "{{ oracle_group }}"
mode: 0644
tags: sql_script
when:
- oracle_pdbs is defined

- name: Create/Modify database
ansible.builtin.include_tasks: manage-db.yml
Expand Down
2 changes: 1 addition & 1 deletion roles/oraswdb_install/templates/dotprofile-home.j2
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
export LD_LIBRARY_PATH
TNS_ADMIN=$ORACLE_HOME/network/admin
export TNS_ADMIN
SQLPATH={{ oracle_user_home }}/.Scripts
SQLPATH={{ oracle_user_home }}/{{ scripts_folder }}
export SQLPATH
ORACLE_SID=
export ORACLE_SID
Expand Down
2 changes: 1 addition & 1 deletion roles/oraswdb_install/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ _oraswdb_install_oracle_directories:
- {name: "{{ oracle_base }}/cfgtoollogs/dbca", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775}
- {name: "{{ oracle_base }}/cfgtoollogs/sqlpatch", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775}
- {name: "{{ oracle_base }}/cfgtoollogs/netca", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775}
- {name: "{{ oracle_user_home }}/.Scripts", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775}
- {name: "{{ oracle_user_home }}/{{ scripts_folder }}", owner: "{{ oracle_user }}", group: "{{ oracle_group }}", mode: 775}

# choptcheck is a dummy for 'creates' during chopt-task to force an execution
_oraswdb_install_choptcheck: "{% if oraswdb_install_forcechopt | bool %}dochopt{% endif %}"
Expand Down
Loading