Skip to content

issue #519 & #520 #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 23, 2024
Merged

issue #519 & #520 #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 14 additions & 4 deletions OracleRAC/OL7/Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down Expand Up @@ -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

#------------------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions OracleRAC/OL7/config/vagrant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion OracleRAC/OL7/scripts/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 14 additions & 4 deletions OracleRAC/OL8/Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions OracleRAC/OL8/config/vagrant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions OracleRAC/OL8/scripts/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 14 additions & 4 deletions OracleRAC/OL9/Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions OracleRAC/OL9/config/vagrant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions OracleRAC/OL9/scripts/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down