diff --git a/OracleRAC/OL7/Vagrantfile b/OracleRAC/OL7/Vagrantfile index 1daeacf..1fd3733 100644 --- a/OracleRAC/OL7/Vagrantfile +++ b/OracleRAC/OL7/Vagrantfile @@ -123,6 +123,8 @@ var_gi_software_ver = (var_gi_software.split("_"))[1].to_i var_db_software = params['env']['db_software'] var_db_software_ver = (var_db_software.split("_"))[1].to_i # +var_skip_check = params['env']['skip_check'] +# var_ora_languages = params['env']['ora_languages'] # var_root_password = params['env']['root_password'] @@ -348,13 +350,21 @@ end path = "./ORCL_software/" + var_gi_software if ! File.exist?(path) - puts "ERROR: gi_software does not exist" - exit + if (var_skip_check == false) + puts "ERROR: gi_software does not exist" + exit + else + puts "WARNING: gi_software does not exist" + end end path = "./ORCL_software/" + var_db_software if ! File.exist?(path) - puts "ERROR: db_software does not exist" - exit + if (var_skip_check == false) + puts "ERROR: db_software does not exist" + exit + else + puts "WARNING: db_software does not exist" + end end #------------------------------------------------------------------ diff --git a/OracleRAC/OL7/config/vagrant.yml b/OracleRAC/OL7/config/vagrant.yml index 5ca07c9..e56247a 100644 --- a/OracleRAC/OL7/config/vagrant.yml +++ b/OracleRAC/OL7/config/vagrant.yml @@ -40,6 +40,7 @@ env: # --------------------------------------------- gi_software: LINUX.X64_213000_grid_home.zip db_software: LINUX.X64_213000_db_home.zip + skip_check: false # --------------------------------------------- root_password: welcome1 grid_password: welcome1 @@ -100,6 +101,7 @@ env: # # --------------------------------------------- # gi_software: LINUX.X64_213000_grid_home.zip # db_software: LINUX.X64_213000_db_home.zip +# skip_check: false # # --------------------------------------------- # root_password: welcome1 # grid_password: welcome1 diff --git a/OracleRAC/OL7/scripts/setup.sh b/OracleRAC/OL7/scripts/setup.sh index e6f8ef4..8817715 100755 --- a/OracleRAC/OL7/scripts/setup.sh +++ b/OracleRAC/OL7/scripts/setup.sh @@ -441,7 +441,10 @@ EOF # MAIN # --------------------------------------------------------------------- # due to UEK4 install and reboot, mount is required -mount -t vboxsf vagrant /vagrant +if [ "${PROVIDER}" == "virtualbox" ]; then + sleep 60 + mount -t vboxsf vagrant /vagrant +fi if [[ `hostname` == ${VM2_NAME} || (`hostname` == ${VM1_NAME} && "${ORESTART}" == "true") ]] then diff --git a/OracleRAC/OL8/Vagrantfile b/OracleRAC/OL8/Vagrantfile index 90bd2fa..fdd4b10 100644 --- a/OracleRAC/OL8/Vagrantfile +++ b/OracleRAC/OL8/Vagrantfile @@ -124,6 +124,8 @@ var_gi_software_ver = (var_gi_software.split("_"))[1].to_i var_db_software = params['env']['db_software'] var_db_software_ver = (var_db_software.split("_"))[1].to_i # +var_skip_check = params['env']['skip_check'] +# var_ora_languages = params['env']['ora_languages'] # var_root_password = params['env']['root_password'] @@ -349,13 +351,21 @@ end path = "./ORCL_software/" + var_gi_software if ! File.exist?(path) - puts "ERROR: gi_software does not exist" - exit + if (var_skip_check == false) + puts "ERROR: gi_software does not exist" + exit + else + puts "WARNING: gi_software does not exist" + end end path = "./ORCL_software/" + var_db_software if ! File.exist?(path) - puts "ERROR: db_software does not exist" - exit + if (var_skip_check == false) + puts "ERROR: db_software does not exist" + exit + else + puts "WARNING: db_software does not exist" + end end var_gi_software_ver_major = var_gi_software_ver.digits.to_a[5].to_s + var_gi_software_ver.digits.to_a[4].to_s diff --git a/OracleRAC/OL8/config/vagrant.yml b/OracleRAC/OL8/config/vagrant.yml index fb71ca9..b0dfffe 100644 --- a/OracleRAC/OL8/config/vagrant.yml +++ b/OracleRAC/OL8/config/vagrant.yml @@ -40,6 +40,7 @@ env: # --------------------------------------------- gi_software: LINUX.X64_213000_grid_home.zip db_software: LINUX.X64_213000_db_home.zip + skip_check: false # --------------------------------------------- root_password: welcome1 grid_password: welcome1 @@ -100,6 +101,7 @@ env: # # --------------------------------------------- # gi_software: LINUX.X64_213000_grid_home.zip # db_software: LINUX.X64_213000_db_home.zip +# skip_check: false # # --------------------------------------------- # root_password: welcome1 # grid_password: welcome1 diff --git a/OracleRAC/OL8/scripts/setup.sh b/OracleRAC/OL8/scripts/setup.sh index 6cd31ee..a3e6f2a 100755 --- a/OracleRAC/OL8/scripts/setup.sh +++ b/OracleRAC/OL8/scripts/setup.sh @@ -442,6 +442,7 @@ EOF # --------------------------------------------------------------------- # due to UEK install and reboot, mount is required if [ "${PROVIDER}" == "virtualbox" ]; then + sleep 60 mount -t vboxsf vagrant /vagrant fi diff --git a/OracleRAC/OL9/Vagrantfile b/OracleRAC/OL9/Vagrantfile index 73e1634..e38fefe 100644 --- a/OracleRAC/OL9/Vagrantfile +++ b/OracleRAC/OL9/Vagrantfile @@ -124,6 +124,8 @@ var_gi_software_ver = (var_gi_software.split("_"))[1].to_i var_db_software = params['env']['db_software'] var_db_software_ver = (var_db_software.split("_"))[1].to_i # +var_skip_check = params['env']['skip_check'] +# var_ora_languages = params['env']['ora_languages'] # var_root_password = params['env']['root_password'] @@ -344,13 +346,21 @@ end path = "./ORCL_software/" + var_gi_software if ! File.exist?(path) - puts "ERROR: gi_software does not exist" - exit + if (var_skip_check == false) + puts "ERROR: gi_software does not exist" + exit + else + puts "WARNING: gi_software does not exist" + end end path = "./ORCL_software/" + var_db_software if ! File.exist?(path) - puts "ERROR: db_software does not exist" - exit + if (var_skip_check == false) + puts "ERROR: db_software does not exist" + exit + else + puts "WARNING: db_software does not exist" + end end var_gi_software_ver_major = var_gi_software_ver.digits.to_a[5].to_s + var_gi_software_ver.digits.to_a[4].to_s diff --git a/OracleRAC/OL9/config/vagrant.yml b/OracleRAC/OL9/config/vagrant.yml index 15ab6a6..558cbc2 100644 --- a/OracleRAC/OL9/config/vagrant.yml +++ b/OracleRAC/OL9/config/vagrant.yml @@ -39,8 +39,9 @@ shared: env: provider: virtualbox # --------------------------------------------- - gi_software: LINUX.X64_XXX000_grid_home.zip - db_software: LINUX.X64_XXX000_db_home.zip + gi_software: LINUX.X64_XXX000_grid_home.zip + db_software: LINUX.X64_XXX000_db_home.zip + skip_check: false # --------------------------------------------- root_password: welcome1 grid_password: welcome1 @@ -99,8 +100,9 @@ env: #env: # provider: libvirt # # --------------------------------------------- -# gi_software: LINUX.X64_XXX000_grid_home.zip -# db_software: LINUX.X64_XXX000_db_home.zip +# gi_software: LINUX.X64_XXX000_grid_home.zip +# db_software: LINUX.X64_XXX000_db_home.zip +# skip_check: false # # --------------------------------------------- # root_password: welcome1 # grid_password: welcome1 diff --git a/OracleRAC/OL9/scripts/setup.sh b/OracleRAC/OL9/scripts/setup.sh index 6d350a6..f1b51cf 100755 --- a/OracleRAC/OL9/scripts/setup.sh +++ b/OracleRAC/OL9/scripts/setup.sh @@ -442,6 +442,7 @@ EOF # --------------------------------------------------------------------- # due to UEK install and reboot, mount is required if [ "${PROVIDER}" == "virtualbox" ]; then + sleep 60 mount -t vboxsf vagrant /vagrant fi