Skip to content

Commit 55174de

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "CI: deploy OpenSearch 1.x instead of Elasticsearch" into stable/zed
2 parents 56ec4f1 + 2d0e484 commit 55174de

1 file changed

Lines changed: 15 additions & 22 deletions

File tree

devstack/plugin.sh

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -301,27 +301,20 @@ function install_influx {
301301
sudo systemctl start influxdb || sudo systemctl restart influxdb
302302
}
303303

304-
function install_elasticsearch_ubuntu {
305-
sudo apt install -qy openjdk-8-jre
306-
local elasticsearch_file=$(get_extra_file https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.3.deb)
307-
sudo dpkg -i --skip-same-version ${elasticsearch_file}
308-
}
309-
310-
function install_elasticsearch_fedora {
311-
sudo yum install -y java-1.8.0-openjdk
312-
local elasticsearch_file=$(get_extra_file https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.3.rpm)
313-
sudo yum localinstall -y ${elasticsearch_file}
314-
}
315-
316-
function install_elasticsearch {
317-
if is_ubuntu; then
318-
install_elasticsearch_ubuntu
319-
elif is_fedora; then
320-
install_elasticsearch_fedora
321-
else
322-
die $LINENO "Distribution must be Debian or Fedora-based"
323-
fi
324-
sudo systemctl start elasticsearch || sudo systemctl restart elasticsearch
304+
function install_opensearch {
305+
OPENSEARCH_HOME=/usr/share/opensearch
306+
local opensearch_file=$(get_extra_file "https://artifacts.opensearch.org/releases/bundle/opensearch/1.3.6/opensearch-1.3.6-linux-x64.tar.gz")
307+
sudo mkdir -p $OPENSEARCH_HOME
308+
sudo tar -xzpf ${opensearch_file} -C $OPENSEARCH_HOME --strip-components=1
309+
sudo mkdir -p $OPENSEARCH_HOME/data /var/log/opensearch
310+
sudo chown -R $STACK_USER $OPENSEARCH_HOME /var/log/opensearch
311+
cat - <<EOF | sudo tee $OPENSEARCH_HOME/config/opensearch.yml >/dev/null
312+
discovery.type: single-node
313+
path.data: /usr/share/opensearch/data
314+
path.logs: /var/log/opensearch
315+
plugins.security.disabled: true
316+
EOF
317+
_run_under_systemd opensearch "$OPENSEARCH_HOME/bin/opensearch"
325318
}
326319

327320
# install_cloudkitty() - Collect source and prepare
@@ -332,7 +325,7 @@ function install_cloudkitty {
332325
if [ $CLOUDKITTY_STORAGE_BACKEND == 'influxdb' ]; then
333326
install_influx
334327
elif [ $CLOUDKITTY_STORAGE_BACKEND == 'elasticsearch' ]; then
335-
install_elasticsearch
328+
install_opensearch
336329
fi
337330
}
338331

0 commit comments

Comments
 (0)