Skip to content

Commit

Permalink
Updating base box URLs to renamed GH pages path.
Browse files Browse the repository at this point in the history
Signed-off-by: Avi Miller <[email protected]>
  • Loading branch information
Djelibeybi committed Jun 11, 2020
1 parent 513f300 commit 10fde0b
Show file tree
Hide file tree
Showing 17 changed files with 61 additions and 63 deletions.
2 changes: 1 addition & 1 deletion ContainerRegistry/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
VAGRANTFILE_API_VERSION = "2"

# Box metadata location and box name
BOX_URL = "https://oracle.github.io/vagrant-boxes/boxes"
BOX_URL = "https://oracle.github.io/vagrant-projects/boxes"
BOX_NAME = "oraclelinux/7"

# Hostname
Expand Down
2 changes: 1 addition & 1 deletion DockerEngine/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
VAGRANTFILE_API_VERSION = "2"

# Box metadata location and box name
BOX_URL = "https://oracle.github.io/vagrant-boxes/boxes"
BOX_URL = "https://oracle.github.io/vagrant-projects/boxes"
BOX_NAME = "oraclelinux/7"

# define hostname
Expand Down
2 changes: 1 addition & 1 deletion Kubernetes/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
VAGRANTFILE_API_VERSION = "2"

# Box metadata location and box name
BOX_URL = "https://oracle.github.io/vagrant-boxes/boxes"
BOX_URL = "https://oracle.github.io/vagrant-projects/boxes"
BOX_NAME = "oraclelinux/7"

# Define constants
Expand Down
2 changes: 1 addition & 1 deletion LAMP/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
VAGRANTFILE_API_VERSION = "2"

# Box metadata location and box name
BOX_URL = "https://oracle.github.io/vagrant-boxes/boxes"
BOX_URL = "https://oracle.github.io/vagrant-projects/boxes"
BOX_NAME = "oraclelinux/7"

# define hostname
Expand Down
2 changes: 1 addition & 1 deletion OLCNE/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ VAGRANTFILE_API_VERSION = "2"
ENV['VAGRANT_NO_PARALLEL'] = 'yes'

# Box metadata location and box name
BOX_URL = "https://oracle.github.io/vagrant-boxes/boxes"
BOX_URL = "https://oracle.github.io/vagrant-projects/boxes"
BOX_NAME = "oraclelinux/7"

# Define constants
Expand Down
2 changes: 1 addition & 1 deletion OracleAPEX/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
VAGRANTFILE_API_VERSION = "2"

# Box metadata location and box name
BOX_URL = "https://oracle.github.io/vagrant-boxes/boxes"
BOX_URL = "https://oracle.github.io/vagrant-projects/boxes"
BOX_NAME = "oraclelinux/7"

# define hostname
Expand Down
43 changes: 21 additions & 22 deletions OracleDG/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
# MODIFIED (MM/DD/YY)
# rcitton 03/30/20 - VBox libvirt & kvm support
# rcitton 11/06/18 - Creation
#
#
# REVISION
# 20200521 - $Revision: 2.0.2.2 $
#
#│▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒│

### -------------------------------------------------------------------
### Disclaimer:
###
Expand All @@ -50,8 +50,8 @@
### DATA OR USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN ACTION IN
### CONTRACT OR TORT, ARISING FROM YOUR ACCESS TO, OR USE OF, THE SOFTWARE.
### -------------------------------------------------------------------
### This script is NOT supported by Oracle World Wide Technical Support.
### The script has been tested and appears to work as intended.
### This script is NOT supported by Oracle World Wide Technical Support.
### The script has been tested and appears to work as intended.
### -------------------------------------------------------------------

# -*- mode: ruby -*-
Expand All @@ -64,7 +64,7 @@ VAGRANTFILE_API_VERSION = "2"

# Vagrant Boxes Source Definition
var_box = 'oraclelinux/7'
var_url = 'https://oracle.github.io/vagrant-boxes/boxes/oraclelinux/7.json'
var_url = 'https://oracle.github.io/vagrant-projects/boxes/oraclelinux/7.json'

puts ""
puts "│▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒│"
Expand Down Expand Up @@ -118,7 +118,7 @@ var_cdb = params['env']['cdb']
# Provider Specific checks
# -----------------------------------------------------------------
if ( (var_provider_name != 'libvirt') and (var_provider_name != 'virtualbox') )
puts "ERROR: 'provider' option can be 'libvirt' or 'virtualbox'"
puts "ERROR: 'provider' option can be 'libvirt' or 'virtualbox'"
exit
else
provider = (var_provider_name).to_sym
Expand All @@ -135,7 +135,7 @@ elsif var_provider_name == 'libvirt'
box_disks_num = 1
ENV['VAGRANT_DEFAULT_PROVIDER'] || 'libvirt'
ENV['VAGRANT_NO_PARALLEL'] = 'yes'
else
else
puts "Not supported #{provider}, exiting..."
exit
end
Expand Down Expand Up @@ -243,14 +243,14 @@ if var_root_password.to_s.empty?
end
if var_oracle_password.to_s.empty?
puts "ERROR: oracle_password is not defined"
exit
exit
end
if var_sys_password.to_s.empty?
puts "ERROR: sys_password is not defined"
exit
end

if (var_cdb == true)
if (var_cdb == true)
if var_pdb_name.to_s.empty?
puts "ERROR: pdb_name is not defined"
exit
Expand Down Expand Up @@ -347,7 +347,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
libvirt.driver = "kvm"
libvirt.memory = var_vm1_mem_size
libvirt.cpus = var_vm1_cpus

libvirt.storage_pool_name = var_vm1_storage
disk_num = 0
while disk_num < box_disks_num do
Expand All @@ -358,12 +358,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
:size => '100G' # defaults to 10G if unspecified!
disk_num += 1
end

# Making oradata disks
libvirt.storage_pool_name = var_oradata_storage
disk_num = disk_num.to_i + 1
num = 0
while num < var_oradata_disk_num do
while num < var_oradata_disk_num do
oradata_disk_size = var_oradata_disk_size.to_s + "G"
libvirt.storage :file,
#:path => '', # automatically chosen if unspecified!
Expand All @@ -387,7 +387,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
libvirt.driver = "kvm"
libvirt.memory = var_vm2_mem_size
libvirt.cpus = var_vm2_cpus

libvirt.storage_pool_name = var_vm2_storage
disk_num = 0
while disk_num < box_disks_num do
Expand All @@ -403,7 +403,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
libvirt.storage_pool_name = var_oradata_storage
disk_num = disk_num.to_i + 1
num = 0
while num < var_oradata_disk_num do
while num < var_oradata_disk_num do
oradata_disk_size = var_oradata_disk_size.to_s + "G"
libvirt.storage :file,
#:path => '', # automatically chosen if unspecified!
Expand All @@ -429,7 +429,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
vb.memory = var_vm1_mem_size
vb.cpus = var_vm1_cpus
vb.customize ["modifyvm", :id, "--groups", var_group] unless var_group.nil?

# Attach default guest vdisks
disk_num = 0
while disk_num < box_disks_num do
Expand All @@ -446,7 +446,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Making oradata disks
disk_num = disk_num.to_i + 1
num = 0
while num < var_oradata_disk_num do
while num < var_oradata_disk_num do
oradata_disk = var_oradata_disk_path + "primary_oradata_disk" + num.to_s + ".vdi"
# Making oradata disks
unless File.exist?(oradata_disk)
Expand All @@ -469,24 +469,24 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
vb.memory = var_vm2_mem_size
vb.cpus = var_vm2_cpus
vb.customize ["modifyvm", :id, "--groups", var_group] unless var_group.nil?

# Attach default guest vdisks
disk_num = 0
while disk_num < box_disks_num do
vb.customize ['storageattach', :id, '--storagectl', 'SATA Controller', '--port', disk_num, '--nonrotational', var_non_rotational]
disk_num += 1
end

# Make u01 vdisk
unless File.exist?(var_vm2_u01_disk)
vb.customize ['createhd', '--filename', var_vm2_u01_disk, '--size', 100 * 1024]
end
vb.customize ['storageattach', :id, '--storagectl', 'SATA Controller', '--port', disk_num, '--device', 0, '--type', 'hdd', '--medium', var_vm2_u01_disk, '--nonrotational', var_non_rotational]

# Making oradata disks
disk_num = disk_num.to_i + 1
num = 0
while num < var_oradata_disk_num do
while num < var_oradata_disk_num do
oradata_disk = var_oradata_disk_path + "standby_oradata_disk" + num.to_s + ".vdi"
# Making oradata disks
unless File.exist?(oradata_disk)
Expand All @@ -502,7 +502,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

# Enable ssh password authentication
config.vm.provision "shell", inline: <<-SHELL
sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
/bin/systemctl restart sshd
SHELL

Expand Down Expand Up @@ -535,4 +535,3 @@ end
#----------------------------------------------------------
# EndOfFile
#----------------------------------------------------------

2 changes: 1 addition & 1 deletion OracleDatabase/11.2.0.2/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
VAGRANTFILE_API_VERSION = "2"

# Box metadata location and box name
BOX_URL = "https://oracle.github.io/vagrant-boxes/boxes"
BOX_URL = "https://oracle.github.io/vagrant-projects/boxes"
BOX_NAME = "oraclelinux/7"

# define hostname
Expand Down
2 changes: 1 addition & 1 deletion OracleDatabase/12.1.0.2/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
VAGRANTFILE_API_VERSION = "2"

# Box metadata location and box name
BOX_URL = "https://oracle.github.io/vagrant-boxes/boxes"
BOX_URL = "https://oracle.github.io/vagrant-projects/boxes"
BOX_NAME = "oraclelinux/7"

# define hostname
Expand Down
2 changes: 1 addition & 1 deletion OracleDatabase/12.2.0.1/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
VAGRANTFILE_API_VERSION = "2"

# Box metadata location and box name
BOX_URL = "https://oracle.github.io/vagrant-boxes/boxes"
BOX_URL = "https://oracle.github.io/vagrant-projects/boxes"
BOX_NAME = "oraclelinux/7"

# define hostname
Expand Down
2 changes: 1 addition & 1 deletion OracleDatabase/18.3.0/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
VAGRANTFILE_API_VERSION = "2"

# Box metadata location and box name
BOX_URL = "https://oracle.github.io/vagrant-boxes/boxes"
BOX_URL = "https://oracle.github.io/vagrant-projects/boxes"
BOX_NAME = "oraclelinux/7"

# define hostname
Expand Down
2 changes: 1 addition & 1 deletion OracleDatabase/18.4.0-XE/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
VAGRANTFILE_API_VERSION = "2"

# Box metadata location and box name
BOX_URL = "https://oracle.github.io/vagrant-boxes/boxes"
BOX_URL = "https://oracle.github.io/vagrant-projects/boxes"
BOX_NAME = "oraclelinux/7"

# define hostname
Expand Down
2 changes: 1 addition & 1 deletion OracleDatabase/19.3.0/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
VAGRANTFILE_API_VERSION = "2"

# Box metadata location and box name
BOX_URL = "https://oracle.github.io/vagrant-boxes/boxes"
BOX_URL = "https://oracle.github.io/vagrant-projects/boxes"
BOX_NAME = "oraclelinux/7"

# define hostname
Expand Down
2 changes: 1 addition & 1 deletion OracleLinux/6/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
VAGRANTFILE_API_VERSION = "2"

# Box metadata location and box name
BOX_URL = "https://oracle.github.io/vagrant-boxes/boxes"
BOX_URL = "https://oracle.github.io/vagrant-projects/boxes"
BOX_NAME = "oraclelinux/6"

# define hostname
Expand Down
2 changes: 1 addition & 1 deletion OracleLinux/7/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
VAGRANTFILE_API_VERSION = "2"

# Box metadata location and box name
BOX_URL = "https://oracle.github.io/vagrant-boxes/boxes"
BOX_URL = "https://oracle.github.io/vagrant-projects/boxes"
BOX_NAME = "oraclelinux/7"

# define hostname
Expand Down
2 changes: 1 addition & 1 deletion OracleLinux/8/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
VAGRANTFILE_API_VERSION = "2"

# Box metadata location and box name
BOX_URL = "https://oracle.github.io/vagrant-boxes/boxes"
BOX_URL = "https://oracle.github.io/vagrant-projects/boxes"
BOX_NAME = "oraclelinux/8"

# define hostname
Expand Down
Loading

0 comments on commit 10fde0b

Please sign in to comment.