Commit 32980114 by Han Su Kim

explicitly state aws_region var

parent e51bfcdd
...@@ -43,7 +43,7 @@ aws_app_dir: "{{ COMMON_APP_DIR }}/aws" ...@@ -43,7 +43,7 @@ aws_app_dir: "{{ COMMON_APP_DIR }}/aws"
aws_s3_sync_script: "{{ aws_app_dir }}/send-logs-to-s3" aws_s3_sync_script: "{{ aws_app_dir }}/send-logs-to-s3"
aws_s3_logfile: "{{ aws_log_dir }}/s3-log-sync.log" aws_s3_logfile: "{{ aws_log_dir }}/s3-log-sync.log"
aws_log_dir: "{{ COMMON_LOG_DIR }}/aws" aws_log_dir: "{{ COMMON_LOG_DIR }}/aws"
aws_region: "us-east-1"
# default path to the aws binary # default path to the aws binary
aws_cmd: "{{ COMMON_BIN_DIR }}/s3cmd" aws_cmd: "{{ COMMON_BIN_DIR }}/s3cmd"
# #
......
...@@ -63,7 +63,7 @@ s3_path=unset ...@@ -63,7 +63,7 @@ s3_path=unset
onerror() { onerror() {
if [[ -z $noop ]]; then if [[ -z $noop ]]; then
message_file=/var/tmp/message-$$.json message_file=/var/tmp/message-$$.json
message_string="Error syncing $s3_path: inst_id=$instance_id ip=$ip region={{ region }}" message_string="Error syncing $s3_path: inst_id=$instance_id ip=$ip region={{ aws_region }}"
if [[ -r "{{ aws_s3_logfile }}" ]]; then if [[ -r "{{ aws_s3_logfile }}" ]]; then
python -c "import json; d={'Subject':{'Data':'$message_string'},'Body':{'Text':{'Data':open('"{{ aws_s3_logfile }}"').read()}}};print json.dumps(d)" > $message_file python -c "import json; d={'Subject':{'Data':'$message_string'},'Body':{'Text':{'Data':open('"{{ aws_s3_logfile }}"').read()}}};print json.dumps(d)" > $message_file
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment