diff --git a/salt/utility/bin/crossthestreams b/salt/utility/bin/crossthestreams deleted file mode 100644 index 38b7ab09c..000000000 --- a/salt/utility/bin/crossthestreams +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -{% set ES = salt['pillar.get']('global:managerip', '') %} -{% set MANAGER = salt['grains.get']('master') %} -{% set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %} - -# Wait for ElasticSearch to come up, so that we can query for version infromation -echo -n "Waiting for ElasticSearch..." -COUNT=0 -ELASTICSEARCH_CONNECTED="no" -while [[ "$COUNT" -le 30 ]]; do - curl -K /opt/so/conf/elasticsearch/curl.config -k --output /dev/null --silent --head --fail -L https://{{ ES }}:9200 - if [ $? -eq 0 ]; then - ELASTICSEARCH_CONNECTED="yes" - echo "connected!" - break - else - ((COUNT+=1)) - sleep 1 - echo -n "." - fi -done -if [ "$ELASTICSEARCH_CONNECTED" == "no" ]; then - echo - echo -e "Connection attempt timed out. Unable to connect to ElasticSearch. \nPlease try: \n -checking log(s) in /var/log/elasticsearch/\n -running 'docker ps' \n -running 'sudo so-elastic-restart'" - echo - - exit -fi - -echo "Applying cross cluster search config..." - curl -K /opt/so/conf/elasticsearch/curl.config -s -k -XPUT -L https://{{ ES }}:9200/_cluster/settings \ - -H 'Content-Type: application/json' \ - -d "{\"persistent\": {\"search\": {\"remote\": {\"{{ MANAGER }}\": {\"seeds\": [\"127.0.0.1:9300\"]}}}}}" - -# Add all the search nodes to cross cluster searching. -{%- if TRUECLUSTER is sameas false %} - {%- if salt['pillar.get']('nodestab', {}) %} - {%- for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %} -curl -K /opt/so/conf/elasticsearch/curl.config -s -k -XPUT -L https://{{ ES }}:9200/_cluster/settings -H'Content-Type: application/json' -d '{"persistent": {"search": {"remote": {"{{ SN }}": {"skip_unavailable": "true", "seeds": ["{{ SN.split('_')|first }}:9300"]}}}}}' - {%- endfor %} - {%- endif %} -{%- endif %} diff --git a/salt/utility/init.sls b/salt/utility/init.sls index a131f0f54..7ca841dd3 100644 --- a/salt/utility/init.sls +++ b/salt/utility/init.sls @@ -1,18 +1,6 @@ {% from 'allowed_states.map.jinja' import allowed_states %} {% if sls in allowed_states %} - -# This state is for checking things - {% if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone'] %} -# Make sure Cross Cluster is good. Will need some logic once we have hot/warm -crossclusterson: - cmd.script: - - shell: /bin/bash - - cwd: /opt/so - - source: salt://utility/bin/crossthestreams - - template: jinja - - {% endif %} {% if grains['role'] in ['so-eval', 'so-import'] %} fixsearch: cmd.script: