From c251594ea6b8227b1be47ea96a47e5a6e1e229d6 Mon Sep 17 00:00:00 2001 From: Vahid Hashemian Date: Wed, 10 Jun 2015 12:18:18 -0700 Subject: [PATCH] Prepare ELK TOSCA Template for Translation into HOT (2) Fix some further issues with the scripts for proper deployment of the translated HOT template. Partially Implements: blueprint translate-tosca-monitoring-usecase Change-Id: Ie8e357e61b0c6256c65774f64080df7ef6b9da46 --- translator/toscalib/tests/artifacts/collectd/config.py | 2 ++ .../toscalib/tests/artifacts/logstash/configure_collectd.py | 2 ++ .../tests/artifacts/logstash/configure_elasticsearch.py | 2 ++ .../toscalib/tests/artifacts/logstash/configure_rsyslog.py | 2 ++ translator/toscalib/tests/artifacts/mongodb/start.sh | 5 +++-- translator/toscalib/tests/artifacts/rsyslog/config.py | 2 ++ 6 files changed, 13 insertions(+), 2 deletions(-) diff --git a/translator/toscalib/tests/artifacts/collectd/config.py b/translator/toscalib/tests/artifacts/collectd/config.py index 7790217..686bbd1 100755 --- a/translator/toscalib/tests/artifacts/collectd/config.py +++ b/translator/toscalib/tests/artifacts/collectd/config.py @@ -1,3 +1,5 @@ +#!/usr/bin/python + # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at diff --git a/translator/toscalib/tests/artifacts/logstash/configure_collectd.py b/translator/toscalib/tests/artifacts/logstash/configure_collectd.py index 7e2e66b..f7eed32 100755 --- a/translator/toscalib/tests/artifacts/logstash/configure_collectd.py +++ b/translator/toscalib/tests/artifacts/logstash/configure_collectd.py @@ -1,3 +1,5 @@ +#!/usr/bin/python + # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at diff --git a/translator/toscalib/tests/artifacts/logstash/configure_elasticsearch.py b/translator/toscalib/tests/artifacts/logstash/configure_elasticsearch.py index 07fc52b..4265afb 100755 --- a/translator/toscalib/tests/artifacts/logstash/configure_elasticsearch.py +++ b/translator/toscalib/tests/artifacts/logstash/configure_elasticsearch.py @@ -1,3 +1,5 @@ +#!/usr/bin/python + # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at diff --git a/translator/toscalib/tests/artifacts/logstash/configure_rsyslog.py b/translator/toscalib/tests/artifacts/logstash/configure_rsyslog.py index b0a0e2a..bbeafed 100755 --- a/translator/toscalib/tests/artifacts/logstash/configure_rsyslog.py +++ b/translator/toscalib/tests/artifacts/logstash/configure_rsyslog.py @@ -1,3 +1,5 @@ +#!/usr/bin/python + # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at diff --git a/translator/toscalib/tests/artifacts/mongodb/start.sh b/translator/toscalib/tests/artifacts/mongodb/start.sh index f683d72..9132eea 100644 --- a/translator/toscalib/tests/artifacts/mongodb/start.sh +++ b/translator/toscalib/tests/artifacts/mongodb/start.sh @@ -1,5 +1,6 @@ #!/bin/sh -x # This script starts mongodb /etc/init.d/mongodb stop -rm /var/lib/mongod.lock -mongod --dbpath /var/lib/mongodb & +rm /var/lib/mongodb/mongod.lock +mongod --repair +mongod --dbpath /var/lib/mongodb --fork --logpath /var/log/mongod.log diff --git a/translator/toscalib/tests/artifacts/rsyslog/config.py b/translator/toscalib/tests/artifacts/rsyslog/config.py index 517ecf9..836f457 100755 --- a/translator/toscalib/tests/artifacts/rsyslog/config.py +++ b/translator/toscalib/tests/artifacts/rsyslog/config.py @@ -1,3 +1,5 @@ +#!/usr/bin/python + # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at