Merge pull request #21 from QingCloudAppcenter/bugfix/script-args

Fix script.* issue
QingCloudAppcenter · Aug 19, 2019 · 5116414 · 5116414
2 parents d587782 + 13f6a19
commit 5116414
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 22 deletions.
diff --git a/ansible/roles/elasticsearch/files/etc/confd/templates/make.sh/01.elasticsearch.yml.tmpl b/ansible/roles/elasticsearch/files/etc/confd/templates/make.sh/01.elasticsearch.yml.tmpl
@@ -44,22 +44,6 @@ discoveryHosts="${masterNodes:-$genericNodes}"
 dataDirs="$(ls -d /data* | xargs echo)"
 dataDirs="$(echo "${dataDirs:-/data /data2 /data3} " | sed 's# #/elasticsearch/data, #g')"
 
-scriptTypes="
-{{- range ls "/env" | filter "(inline|stored|file)" }}
-{{ if eq (getv (printf "/env/%s" .)) "true" }}{{ replace . "script." "" -1 }}{{ end }}
-{{- end }}
-"
-scriptTypes="$(echo $scriptTypes)"
-scriptTypes="${scriptTypes// /,}"
-
-scriptContexts="
-{{- range ls "/env" | filter "(aggs|search|update)" }}
-{{ if eq (getv (printf "/env/%s" .)) "true" }}{{ replace . "script." "" -1 }}{{ end }}
-{{- end }}
-"
-scriptContexts="$(echo $scriptContexts)"
-scriptContexts="${scriptContexts// /,}"
-
 cat > /opt/app/conf/elasticsearch/elasticsearch.yml << ES_YML_EOF
 action.destructive_requires_name: {{ getv "/env/action.destructive_requires_name" "true" }}
 bootstrap.memory_lock: true
@@ -116,8 +100,9 @@ reindex.remote.whitelist: "{{ getv "/env/reindex.remote.whitelist" "" }}"
 {{- end }}
 repositories.url.allowed_urls: {{ getv "/env/repositories.url.allowed_urls" "[]" }}
 
-script.allowed_contexts: ${scriptContexts:-none}
-script.allowed_types: ${scriptTypes:-none}
+{{- range gets "/env/script.*" }}
+{{ base .Key }}: {{ .Value }}
+{{- end }}
 
 {{- range getvs "/env/es_additional_line*" }}
 {{ . }}

diff --git a/app/cluster.json.mustache b/app/cluster.json.mustache
@@ -20,7 +20,7 @@
     "container": {
       "type": "kvm",
       "zone": "pek3a",
-      "image": "img-fv5krcqs"
+      "image": "img-jvs3zqzm"
     },
     "instance_class": {{cluster.es_node.instance_class}},
     "count": {{cluster.es_node.count}},
@@ -235,7 +235,7 @@
     "container": {
       "type": "kvm",
       "zone": "pek3a",
-      "image": "img-fv5krcqs"
+      "image": "img-jvs3zqzm"
     },
     "instance_class": {{cluster.es_master_node.instance_class}},
     "count": {{cluster.es_master_node.count}},
@@ -441,7 +441,7 @@
     "container": {
       "type": "kvm",
       "zone": "pek3a",
-      "image": "img-fv5krcqs"
+      "image": "img-jvs3zqzm"
     },
     "instance_class": {{cluster.es_node_2.instance_class}},
     "count": {{cluster.es_node_2.count}},
@@ -656,7 +656,7 @@
     "container": {
       "type": "kvm",
       "zone": "pek3a",
-      "image": "img-fv5krcqs"
+      "image": "img-jvs3zqzm"
     },
     "instance_class": {{cluster.es_node_3.instance_class}},
     "count": {{cluster.es_node_3.count}},