Skip to content
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

Jump to bottom

fix bug #2

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix bug #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06bc766
Update install-consul.sh
qiuwenhuifx Aug 19, 2019
4f89ac2
Update install-consul.sh
qiuwenhuifx Aug 19, 2019
1bf5b70
Update install-utils.sh
qiuwenhuifx Aug 19, 2019
5323333
Update Vagrantfile
qiuwenhuifx Aug 19, 2019
cc5b4ef
Update install-consul.sh
qiuwenhuifx Aug 19, 2019
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
4 changes: 3 additions & 1 deletion test/Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ Vagrant.configure("2") do |config|
monitor.vm.box = "centos/7"
monitor.vm.hostname = 'monitor'
monitor.vm.network "private_network", ip: "10.10.10.20"
monitor.vm.network "forwarded_port", guest: 3000, host: 3000
monitor.vm.network "forwarded_port", guest: 9000, host: 9000
monitor.vm.box_check_update = false
monitor.vm.provider "virtualbox" do |v|
v.linked_clone = true
Expand Down Expand Up @@ -122,4 +124,4 @@ Vagrant.configure("2") do |config|

monitor.vm.provision "shell", inline: "sudo -iu postgres /opt/bin/init-primary.sh postgres:///meta"
end
end
end
2 changes: 1 addition & 1 deletion test/bin/install-consul.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,4 @@ function main(){
# 5 get local IP failed
# 6 launch consul.service failed
#==============================================================#
main $@
main $@
7 changes: 4 additions & 3 deletions test/bin/install-utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,13 @@ function install_utils() {
lsof \
wget \
unzip $@ >/dev/null 2>&1

if [[ $? != 0 ]]; then
echo 'error: install utils failed'
return 3
fi

# retry install
yum install -y ntp uuid readline lz4 nc libxml2 libxslt lsof wget unzip sysstat vim
systemctl enable ntpd > /dev/null 2>&1
systemctl start ntpd > /dev/null 2>&1

Expand Down Expand Up @@ -144,4 +145,4 @@ function main(){
return $?
}

main $@
main $@