From e733c84dba28a95a1e640cb514a1c1e99efa5fdc Mon Sep 17 00:00:00 2001 From: Trinh Nguyen Date: Tue, 18 Sep 2018 10:31:32 +0900 Subject: [PATCH] Update vagrant file This patch updates local.conf to use ElasticSearch 5.x and ubuntu/xenial64 image for Vagrantfile Change-Id: Ifa872e8cc7dbe05918434f2981846dc25650bdfe Signed-off-by: Trinh Nguyen --- contrib/vagrant/Vagrantfile | 2 +- contrib/vagrant/local.conf | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/contrib/vagrant/Vagrantfile b/contrib/vagrant/Vagrantfile index 395a0caf..a99433f2 100644 --- a/contrib/vagrant/Vagrantfile +++ b/contrib/vagrant/Vagrantfile @@ -54,7 +54,7 @@ fi SCRIPT config.vm.define "searchlight-ubuntu" do |ubuntu| - ubuntu.vm.box = "ubuntu/trusty64" + ubuntu.vm.box = "ubuntu/xenial64" ubuntu.vm.network :private_network, ip: "192.168.27.100" diff --git a/contrib/vagrant/local.conf b/contrib/vagrant/local.conf index 8fe0b9c1..5123495f 100644 --- a/contrib/vagrant/local.conf +++ b/contrib/vagrant/local.conf @@ -7,10 +7,10 @@ HOST_IP=192.168.27.101 SERVICE_HOST=$HOST_IP ADMIN_PASSWORD=devstack -MYSQL_PASSWORD=devstack -RABBIT_PASSWORD=devstack +MYSQL_PASSWORD=$ADMIN_PASSWORD +RABBIT_PASSWORD=$ADMIN_PASSWORD SERVICE_PASSWORD=$ADMIN_PASSWORD -SERVICE_TOKEN=devstack +SERVICE_TOKEN=$ADMIN_PASSWORD # Logging LOGFILE=$DEST/logs/stack.sh.log @@ -18,6 +18,10 @@ VERBOSE=True ENABLE_DEBUG_LOG_LEVEL=True ENABLE_VERBOSE_LOG_LEVEL=True +# ElasticSearch version +# Currently, only ElasticSearch 2.x and 5.x are supported +ELASTICSEARCH_VERSION=5.6.11 + # Enable Searchlight plugin enable_plugin searchlight https://git.openstack.org/openstack/searchlight master