Skip to content

Commit d1c121a

Browse files
talekRendanic
authored andcommitted
Move scripts_folder variable from common to orahost_meta
1 parent 483cd2d commit d1c121a

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
bugfixes:
3+
- "orahost_meta: move scripts_folder variable from common to orahost_meta"

roles/common/README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ sets up the host generic stuff
2525
- [ntp_type](#ntp_type)
2626
- [ol6_repo_file](#ol6_repo_file)
2727
- [ol7_repo_file](#ol7_repo_file)
28-
- [scripts_folder](#scripts_folder)
2928
- [Discovered Tags](#discovered-tags)
3029
- [Dependencies](#dependencies)
3130
- [License](#license)
@@ -395,10 +394,6 @@ The variable is used to cleanup the yum repolist for old installations.
395394
ol7_repo_file: public-yum-ol7.repo
396395
```
397396

398-
### scripts_folder
399-
400-
Folder under Oracle user home dir to place scripts in
401-
402397
#### Default value
403398

404399
```YAML

roles/common/defaults/main.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ configure_public_yum_repo: true
3030
# @var configure_motd:description: Configure Message of the day
3131
configure_motd: true
3232

33-
# @var scripts_folder:description: Folder under Oracle user home dir to place scripts in
34-
scripts_folder: .Scripts
35-
3633
# @var motd_template:description: Used templatename for Message of the day
3734
motd_template: motd.j2
3835

roles/orahost_meta/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Meta role used by other roles to share variable defaults.
2626
- [oracle_tmp_stage](#oracle_tmp_stage)
2727
- [oracle_user](#oracle_user)
2828
- [oracle_user_home](#oracle_user_home)
29+
- [scripts_folder](#scripts_folder)
2930
- [orahost_meta_cv_assume_distid](#orahost_meta_cv_assume_distid)
3031
- [orahost_meta_java_options](#orahost_meta_java_options)
3132
- [orahost_meta_tmpdir](#orahost_meta_tmpdir)
@@ -318,6 +319,10 @@ home directory for `oracle_user`.
318319
oracle_user_home: /home/oracle
319320
```
320321

322+
### scripts_folder
323+
324+
Folder under Oracle user home dir to place scripts in
325+
321326
### orahost_meta_cv_assume_distid
322327

323328
The variable is used by `oracle_script_env` and passed

roles/orahost_meta/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ role_separation: false
2828
# @var oracle_user_home: $ "/home/oracle"
2929
oracle_user_home: "/home/{{ oracle_user }}"
3030

31+
# @var scripts_folder:description: Folder under Oracle user home dir to place scripts in
32+
scripts_folder: .Scripts
33+
3134
# @var grid_user_home:description: >
3235
# home directory for `grid_user`.
3336
#

0 commit comments

Comments
 (0)