Scripts folder fix

changelogs/fragments/scripts_folder_fix.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - "orahost_meta: move scripts_folder variable from common to orahost_meta"

roles/common/README.md

@@ -25,7 +25,6 @@ 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)
@@ -395,10 +394,6 @@ 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

roles/common/defaults/main.yml

@@ -30,9 +30,6 @@ 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
 

roles/orahost_meta/README.md

@@ -26,6 +26,7 @@ Meta role used by other roles to share variable defaults.
   - [oracle_tmp_stage](#oracle_tmp_stage)
   - [oracle_user](#oracle_user)
   - [oracle_user_home](#oracle_user_home)
+  - [scripts_folder](#scripts_folder)
   - [orahost_meta_cv_assume_distid](#orahost_meta_cv_assume_distid)
   - [orahost_meta_java_options](#orahost_meta_java_options)
   - [orahost_meta_tmpdir](#orahost_meta_tmpdir)
@@ -318,6 +319,10 @@ home directory for `oracle_user`.
 oracle_user_home: /home/oracle
 ```
 
+### scripts_folder
+
+Folder under Oracle user home dir to place scripts in
+
 ### orahost_meta_cv_assume_distid
 
 The variable is used by `oracle_script_env` and passed

roles/orahost_meta/defaults/main.yml

@@ -28,6 +28,9 @@ role_separation: false
 # @var oracle_user_home: $ "/home/oracle"
 oracle_user_home: "/home/{{ oracle_user }}"
 
+# @var scripts_folder:description: Folder under Oracle user home dir to place scripts in
+scripts_folder: .Scripts
+
 # @var grid_user_home:description: >
 # home directory for `grid_user`.
 #