Skip to content
This repository was archived by the owner on Feb 5, 2024. It is now read-only.

Commit 06f09b1

Browse files
committed
fix Vagrant: update Ubuntu boxes (14 -> 16), Oracle Java -> OpenJDK
1 parent 974f3cf commit 06f09b1

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

Readme.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ Requires:
1818
* Vagrant
1919

2020
1. Before startup, clear logs and remove naming service data folder.
21-
1. Run `vagrant up` to startup the naming service and the raid node. Note, that vagrant up will pull on the first startup the latest source code from GitHub and build a new jar.
21+
1. Run `vagrant up` to startup the naming service, the raid node and all the floor nodes (floor0 through floor2). Note, that vagrant up will pull on the first startup the latest source code from GitHub and build a new jar.
2222
* The raid node vm will also compile the FBaseExampleClients jars on first startup.
2323
* The raid vm will use Registration.jar to register the other floor nodes at the naming service.
24-
1. Run `vagrant up floor0` to startup the ground level floor node. Do the same for floor1 and floor2 (you can do this in parallel).
2524
1. Create the keygroups (`vagrant provision raid --provision-with run_client_keygroupBootstrap`), make sure that it worked, otherwise run again.
2625
1. Tell every floor node to update its local keygroup config for each keygroup created (because otherwise they do not know about them, note: raid knows because of above already about keygroups): `vagrant provision floor0 --provision-with run_client_keygroupUpdateSubscriptions` (also for floor0, floor1, floor2)
2726
1. Start generation of records for floor nodes: `vagrant provision floor0 --provision-with run_client_addRecords` (also for floor0, floor1, floor2)

Vagrantfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ Vagrant.configure("2") do |config|
3030

3131
# startup instances
3232
config.vm.define "namingService" do |ns|
33-
ns.vm.box = "ubuntu/trusty64"
33+
ns.vm.box = "ubuntu/xenial64"
3434
ns.vm.network "private_network", ip: "192.168.0.200", bridge: "en0: WLAN (AirPort)"
3535

3636
ns.vm.provision "shell", path: "vagrantfiles/build_github_repo.sh", args: ["FBaseNamingService", "https://github.com/OpenFogStack/FBaseNamingService.git"]
3737
ns.vm.provision "startup_jar", type: "shell", run: "always", path: "vagrantfiles/startup_jar.sh", args:["/home/vagrant/FBaseNamingService/target/fbasenamingservice-0.0.1-SNAPSHOT-jar-with-dependencies.jar", "/vagrant/fbase_configurations/naming_service/namingService.properties", "/vagrant/logs/namingService.log"]
3838
end
3939

4040
config.vm.define "raid" do |raid|
41-
raid.vm.box = "ubuntu/trusty64"
41+
raid.vm.box = "ubuntu/xenial64"
4242
raid.vm.network "private_network", ip: "192.168.0.100", bridge: "en0: WLAN (AirPort)"
4343

4444
raid.vm.provision "shell", path: "vagrantfiles/build_github_repo.sh", args: ["FBase", "https://github.com/OpenFogStack/FBase"]
@@ -55,7 +55,7 @@ Vagrant.configure("2") do |config|
5555
end
5656

5757
config.vm.define "floor0", autostart: true do |floor0|
58-
floor0.vm.box = "ubuntu/trusty64"
58+
floor0.vm.box = "ubuntu/xenial64"
5959
floor0.vm.network "private_network", ip: "192.168.0.50", bridge: "en0: WLAN (AirPort)"
6060

6161
floor0.vm.provision "shell", path: "vagrantfiles/build_github_repo.sh", args: ["FBase", "https://github.com/OpenFogStack/FBase"]
@@ -67,7 +67,7 @@ Vagrant.configure("2") do |config|
6767
end
6868

6969
config.vm.define "floor1", autostart: true do |floor1|
70-
floor1.vm.box = "ubuntu/trusty64"
70+
floor1.vm.box = "ubuntu/xenial64"
7171
floor1.vm.network "private_network", ip: "192.168.0.51", bridge: "en0: WLAN (AirPort)"
7272

7373
floor1.vm.provision "shell", path: "vagrantfiles/build_github_repo.sh", args: ["FBase", "https://github.com/OpenFogStack/FBase"]
@@ -79,7 +79,7 @@ Vagrant.configure("2") do |config|
7979
end
8080

8181
config.vm.define "floor2", autostart: true do |floor2|
82-
floor2.vm.box = "ubuntu/trusty64"
82+
floor2.vm.box = "ubuntu/xenial64"
8383
floor2.vm.network "private_network", ip: "192.168.0.52", bridge: "en0: WLAN (AirPort)"
8484

8585
floor2.vm.provision "shell", path: "vagrantfiles/build_github_repo.sh", args: ["FBase", "https://github.com/OpenFogStack/FBase"]

vagrantfiles/setup_os_and_tools.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22

33
# Update everything
4-
sudo apt-get -y upgrade
54
sudo apt-get -y update
5+
sudo apt-get -y upgrade
66

77
# Set Encoding
88
sudo echo "LANG=en_US.UTF-8" >> /etc/environment
@@ -18,12 +18,7 @@ sudo apt-get -y install git
1818

1919
### Install java 8
2020
echo "INSTALLING JAVA 8"
21-
sudo add-apt-repository -y ppa:webupd8team/java
22-
sudo apt-get update
23-
sudo apt-get -y upgrade
24-
echo debconf shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections
25-
echo debconf shared/accepted-oracle-license-v1-1 seen true | sudo debconf-set-selections
26-
sudo apt-get -y install oracle-java8-installer
21+
sudo apt-get -y install openjdk-8-jdk
2722

2823
### Install maven
2924
echo "INSTALLING MAVEN"

0 commit comments

Comments
 (0)