Restructure monitoring scripts

[bottlenecks.git] / monitor / dispatch / automate_cadvisor_client.py

diff --git a/monitor/automate_cadvisor_client.py b/monitor/dispatch/automate_cadvisor_client.py
similarity index 82%
rename from monitor/automate_cadvisor_client.py
rename to monitor/dispatch/automate_cadvisor_client.py
index f84892d..3a65ff1 100644 (file)
--- a/monitor/automate_cadvisor_client.py
+++ b/monitor/dispatch/automate_cadvisor_client.py
@@ -12,7 +12,8 @@ import yaml
 import utils.infra_setup.passwordless_SSH.ssh as ssh
 
 logger = logging.getLogger(__name__)
-cadvisor_install_sh = "/home/opnfv/bottlenecks/monitor/cadvisor_install.sh"
+cadvisor_client_install_sh =\
+    "/home/opnfv/bottlenecks/monitor/dispatch/install_cadvisor_client.sh"
 
 with open('/tmp/pod.yaml') as f:
     dataMap = yaml.safe_load(f)
@@ -27,13 +28,14 @@ with open('/tmp/pod.yaml') as f:
                     "cd /etc && mkdir cadvisor_config"
                 )
                 if status:
-                    raise Exception("Command failed with non-zero status.")
+                    print Exception(
+                        "Command: \"mkdir cadvisor_config\" failed.")
                     logger.info(stdout.splitlines())
-                with open(cadvisor_install_sh) as stdin_file:
+                with open(cadvisor_client_install_sh) as stdin_file:
                     ssh_d.run("cat > /etc/cadvisor_config/install.sh",
                               stdin=stdin_file)
                 status, stdout, stderr = ssh_d.execute(
-                    "sudo apt-get install docker.io"
+                    "sudo apt-get install -y docker.io"
                 )
                 if status:
                     raise Exception("Command for installing docker failed.")