CORD-993
Eliminate elastic VM, install elasticstack on prod
remove old elastic VM config, install python-netaddr
Change-Id: I27f155733bc5c374e22cefec33086480ecb89df3
diff --git a/scripts/bootstrap_ansible.sh b/scripts/bootstrap_ansible.sh
index ddaa522..6c7db5b 100755
--- a/scripts/bootstrap_ansible.sh
+++ b/scripts/bootstrap_ansible.sh
@@ -18,8 +18,8 @@
set -e
echo "Installing Ansible..."
-apt-get install -y software-properties-common
+apt-get install -y software-properties-common python-netaddr apt-transport-https
apt-add-repository ppa:ansible/ansible
apt-get update
-apt-get install -y ansible apt-transport-https
+apt-get install -y ansible
cp /cord/build/ansible/ansible.cfg /etc/ansible/ansible.cfg
diff --git a/scripts/cord-in-a-box.sh b/scripts/cord-in-a-box.sh
index 4ff7afe..17e3b65 100755
--- a/scripts/cord-in-a-box.sh
+++ b/scripts/cord-in-a-box.sh
@@ -150,17 +150,11 @@
}
function elk_up() {
- cd $CORDDIR/build
-
- sudo su $USER -c 'vagrant up elastic --provider libvirt'
-
- # This is a workaround for a weird issue with ARP cache timeout breaking 'vagrant ssh'
- # It allows SSH'ing to the machine via 'ssh corddev'
- sudo su $USER -c "vagrant ssh-config elastic > $SSHCONFIG"
cd $CORDDIR
sudo chmod +x build/elk-logger/logstash_tail
- build/elk-logger/logstash_tail --file install.out --hostport 10.100.198.222:5617 &
+
+ build/elk-logger/logstash_tail --file install.out --hostport 10.100.198.201:5617 &
}
function vagrant_vms_up() {
@@ -330,8 +324,8 @@
bootstrap
run_stage cloudlab_setup
-run_stage elk_up
run_stage vagrant_vms_up
+run_stage elk_up
if [[ $SETUP_ONLY -ne 0 ]]
then