Skip to content

Commit c8de3d9

Browse files
scoter-oraclescoter-oracle
authored
Merge pull request #521 from rcitton/rcitton
issue #519 & #520
2 parents 204ee0b + a2e47f3 commit c8de3d9

File tree

9 files changed

+58
-17
lines changed

9 files changed

+58
-17
lines changed

‎OracleRAC/OL7/Vagrantfile

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ var_gi_software_ver = (var_gi_software.split("_"))[1].to_i
123123
var_db_software = params['env']['db_software']
124124
var_db_software_ver = (var_db_software.split("_"))[1].to_i
125125
#
126+
var_skip_check = params['env']['skip_check']
127+
#
126128
var_ora_languages = params['env']['ora_languages']
127129
#
128130
var_root_password = params['env']['root_password']
@@ -348,13 +350,21 @@ end
348350

349351
path = "./ORCL_software/" + var_gi_software
350352
if ! File.exist?(path)
351-
puts "ERROR: gi_software does not exist"
352-
exit
353+
if (var_skip_check == false)
354+
puts "ERROR: gi_software does not exist"
355+
exit
356+
else
357+
puts "WARNING: gi_software does not exist"
358+
end
353359
end
354360
path = "./ORCL_software/" + var_db_software
355361
if ! File.exist?(path)
356-
puts "ERROR: db_software does not exist"
357-
exit
362+
if (var_skip_check == false)
363+
puts "ERROR: db_software does not exist"
364+
exit
365+
else
366+
puts "WARNING: db_software does not exist"
367+
end
358368
end
359369

360370
#------------------------------------------------------------------

‎OracleRAC/OL7/config/vagrant.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ env:
4040
# ---------------------------------------------
4141
gi_software: LINUX.X64_213000_grid_home.zip
4242
db_software: LINUX.X64_213000_db_home.zip
43+
skip_check: false
4344
# ---------------------------------------------
4445
root_password: welcome1
4546
grid_password: welcome1
@@ -100,6 +101,7 @@ env:
100101
# # ---------------------------------------------
101102
# gi_software: LINUX.X64_213000_grid_home.zip
102103
# db_software: LINUX.X64_213000_db_home.zip
104+
# skip_check: false
103105
# # ---------------------------------------------
104106
# root_password: welcome1
105107
# grid_password: welcome1

‎OracleRAC/OL7/scripts/setup.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,10 @@ EOF
441441
# MAIN
442442
# ---------------------------------------------------------------------
443443
# due to UEK4 install and reboot, mount is required
444-
mount -t vboxsf vagrant /vagrant
444+
if [ "${PROVIDER}" == "virtualbox" ]; then
445+
sleep 60
446+
mount -t vboxsf vagrant /vagrant
447+
fi
445448

446449
if [[ `hostname` == ${VM2_NAME} || (`hostname` == ${VM1_NAME} && "${ORESTART}" == "true") ]]
447450
then

‎OracleRAC/OL8/Vagrantfile

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ var_gi_software_ver = (var_gi_software.split("_"))[1].to_i
124124
var_db_software = params['env']['db_software']
125125
var_db_software_ver = (var_db_software.split("_"))[1].to_i
126126
#
127+
var_skip_check = params['env']['skip_check']
128+
#
127129
var_ora_languages = params['env']['ora_languages']
128130
#
129131
var_root_password = params['env']['root_password']
@@ -349,13 +351,21 @@ end
349351

350352
path = "./ORCL_software/" + var_gi_software
351353
if ! File.exist?(path)
352-
puts "ERROR: gi_software does not exist"
353-
exit
354+
if (var_skip_check == false)
355+
puts "ERROR: gi_software does not exist"
356+
exit
357+
else
358+
puts "WARNING: gi_software does not exist"
359+
end
354360
end
355361
path = "./ORCL_software/" + var_db_software
356362
if ! File.exist?(path)
357-
puts "ERROR: db_software does not exist"
358-
exit
363+
if (var_skip_check == false)
364+
puts "ERROR: db_software does not exist"
365+
exit
366+
else
367+
puts "WARNING: db_software does not exist"
368+
end
359369
end
360370

361371
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

‎OracleRAC/OL8/config/vagrant.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ env:
4040
# ---------------------------------------------
4141
gi_software: LINUX.X64_213000_grid_home.zip
4242
db_software: LINUX.X64_213000_db_home.zip
43+
skip_check: false
4344
# ---------------------------------------------
4445
root_password: welcome1
4546
grid_password: welcome1
@@ -100,6 +101,7 @@ env:
100101
# # ---------------------------------------------
101102
# gi_software: LINUX.X64_213000_grid_home.zip
102103
# db_software: LINUX.X64_213000_db_home.zip
104+
# skip_check: false
103105
# # ---------------------------------------------
104106
# root_password: welcome1
105107
# grid_password: welcome1

‎OracleRAC/OL8/scripts/setup.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,7 @@ EOF
442442
# ---------------------------------------------------------------------
443443
# due to UEK install and reboot, mount is required
444444
if [ "${PROVIDER}" == "virtualbox" ]; then
445+
sleep 60
445446
mount -t vboxsf vagrant /vagrant
446447
fi
447448

‎OracleRAC/OL9/Vagrantfile

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ var_gi_software_ver = (var_gi_software.split("_"))[1].to_i
124124
var_db_software = params['env']['db_software']
125125
var_db_software_ver = (var_db_software.split("_"))[1].to_i
126126
#
127+
var_skip_check = params['env']['skip_check']
128+
#
127129
var_ora_languages = params['env']['ora_languages']
128130
#
129131
var_root_password = params['env']['root_password']
@@ -344,13 +346,21 @@ end
344346

345347
path = "./ORCL_software/" + var_gi_software
346348
if ! File.exist?(path)
347-
puts "ERROR: gi_software does not exist"
348-
exit
349+
if (var_skip_check == false)
350+
puts "ERROR: gi_software does not exist"
351+
exit
352+
else
353+
puts "WARNING: gi_software does not exist"
354+
end
349355
end
350356
path = "./ORCL_software/" + var_db_software
351357
if ! File.exist?(path)
352-
puts "ERROR: db_software does not exist"
353-
exit
358+
if (var_skip_check == false)
359+
puts "ERROR: db_software does not exist"
360+
exit
361+
else
362+
puts "WARNING: db_software does not exist"
363+
end
354364
end
355365

356366
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

‎OracleRAC/OL9/config/vagrant.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ shared:
3939
env:
4040
provider: virtualbox
4141
# ---------------------------------------------
42-
gi_software: LINUX.X64_XXX000_grid_home.zip
43-
db_software: LINUX.X64_XXX000_db_home.zip
42+
gi_software: LINUX.X64_XXX000_grid_home.zip
43+
db_software: LINUX.X64_XXX000_db_home.zip
44+
skip_check: false
4445
# ---------------------------------------------
4546
root_password: welcome1
4647
grid_password: welcome1
@@ -99,8 +100,9 @@ env:
99100
#env:
100101
# provider: libvirt
101102
# # ---------------------------------------------
102-
# gi_software: LINUX.X64_XXX000_grid_home.zip
103-
# db_software: LINUX.X64_XXX000_db_home.zip
103+
# gi_software: LINUX.X64_XXX000_grid_home.zip
104+
# db_software: LINUX.X64_XXX000_db_home.zip
105+
# skip_check: false
104106
# # ---------------------------------------------
105107
# root_password: welcome1
106108
# grid_password: welcome1

‎OracleRAC/OL9/scripts/setup.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,7 @@ EOF
442442
# ---------------------------------------------------------------------
443443
# due to UEK install and reboot, mount is required
444444
if [ "${PROVIDER}" == "virtualbox" ]; then
445+
sleep 60
445446
mount -t vboxsf vagrant /vagrant
446447
fi
447448

0 commit comments

Comments
 (0)