From 0a402291ff1b7d1f9f0fbadbcb250b9141300cea Mon Sep 17 00:00:00 2001 From: alexey-kravtsov Date: Fri, 3 Nov 2017 15:00:03 +0300 Subject: [PATCH 1/2] ATSD update --- vagrant_files/basic/axibase.rb | 12 +++--------- vagrant_files/vagrantconf_db.rb | 3 ++- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/vagrant_files/basic/axibase.rb b/vagrant_files/basic/axibase.rb index 2d0888b..d7ddf90 100644 --- a/vagrant_files/basic/axibase.rb +++ b/vagrant_files/basic/axibase.rb @@ -1,24 +1,18 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Installing Axibase config.vm.provision "shell", inline: "apt-get -q -y install sysstat openssh-server cron telnet debconf libc6 passwd adduser iproute net-tools curl netcat-openbsd" - config.vm.provision "shell", inline: "echo 'deb http://archive.ubuntu.com/ubuntu/ vivid main universe' >> /etc/apt/sources.list" + config.vm.provision "shell", inline: "echo 'deb http://archive.ubuntu.com/ubuntu/ xenial main universe' >> /etc/apt/sources.list" config.vm.provision "shell", inline: "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 26AEE425A57967CFB323846008796A6514F3CB79" config.vm.provision "shell", inline: "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 40976EAF437D05B5 3B4FE6ACC0B21F32" config.vm.provision "shell", inline: "apt-get update" - config.vm.provision "shell", inline: "apt-get --allow-unauthenticated -q -y install openjdk-6-jre-headless libjpeg8 openjdk-6-jre openjdk-6-jdk" + config.vm.provision "shell", inline: "apt-get --allow-unauthenticated -q -y install openjdk-8-jdk libjpeg8" config.vm.provision "shell", inline: "useradd -m axibase" # the deb package postinstall script has an error prompting for pw does not work, this part is skipped if the axibase user exists - - config.vm.provision "shell", inline: "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 26AEE425A57967CFB323846008796A6514F3CB79" config.vm.provision "shell", inline: "apt-get -q -y install software-properties-common" config.vm.provision "shell", inline: "add-apt-repository 'deb [arch=amd64] http://axibase.com/public/repository/deb/ ./'" config.vm.provision "shell", inline: "apt-get update" - config.vm.provision "shell", inline: "apt-get -q -y install atsd" - -# config.vm.provision "shell", inline: "wget http://axibase.com/public/atsd_ce_11467_amd64.deb" -# config.vm.provision "shell", inline: "dpkg -i atsd_ce_11467_amd64.deb" + config.vm.provision "shell", inline: "DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y atsd" -# config.vm.provision "shell", inline: "dpkg -i ~vagrant/files/atsd_ce_11554_amd64.deb" # give axibase some time to run config.vm.provision "shell", inline: "sleep 10" # set admin user diff --git a/vagrant_files/vagrantconf_db.rb b/vagrant_files/vagrantconf_db.rb index b6ce485..abd948a 100644 --- a/vagrant_files/vagrantconf_db.rb +++ b/vagrant_files/vagrantconf_db.rb @@ -21,4 +21,5 @@ # 512mb is not enough for cassandra # 4096mb is not enough for cassandra + blueflood -# 8096mb is not enough for druid (single) \ No newline at end of file +# 8096mb is not enough for druid (single) +# 2048mb is a minimal requiered memory for ATSD From d5df835fe6e255f96531ba9d132a0fa6b5cb3513 Mon Sep 17 00:00:00 2001 From: alexey-kravtsov Date: Fri, 3 Nov 2017 15:19:39 +0300 Subject: [PATCH 2/2] removed unused package --- vagrant_files/basic/axibase.rb | 2 +- vagrant_files/vagrantconf_db.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vagrant_files/basic/axibase.rb b/vagrant_files/basic/axibase.rb index d7ddf90..aaa4fdf 100644 --- a/vagrant_files/basic/axibase.rb +++ b/vagrant_files/basic/axibase.rb @@ -5,7 +5,7 @@ config.vm.provision "shell", inline: "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 26AEE425A57967CFB323846008796A6514F3CB79" config.vm.provision "shell", inline: "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 40976EAF437D05B5 3B4FE6ACC0B21F32" config.vm.provision "shell", inline: "apt-get update" - config.vm.provision "shell", inline: "apt-get --allow-unauthenticated -q -y install openjdk-8-jdk libjpeg8" + config.vm.provision "shell", inline: "apt-get --allow-unauthenticated -q -y install openjdk-8-jdk" config.vm.provision "shell", inline: "useradd -m axibase" # the deb package postinstall script has an error prompting for pw does not work, this part is skipped if the axibase user exists config.vm.provision "shell", inline: "apt-get -q -y install software-properties-common" diff --git a/vagrant_files/vagrantconf_db.rb b/vagrant_files/vagrantconf_db.rb index abd948a..6e5a178 100644 --- a/vagrant_files/vagrantconf_db.rb +++ b/vagrant_files/vagrantconf_db.rb @@ -22,4 +22,4 @@ # 512mb is not enough for cassandra # 4096mb is not enough for cassandra + blueflood # 8096mb is not enough for druid (single) -# 2048mb is a minimal requiered memory for ATSD +# 2048mb is a minimum memory required for ATSD