FD3-398 fix merge

tools/playbook.yml

@@ -15,12 +15,10 @@
   connection: local
   tags: start_mysql
   tasks:
-    - name: Docker-compse build 
+    - name: Docker build
       command: "docker-compose build"
-    - name: Docker-compse pull
-      command: "docker-compose pull"
     - name: Docker mysql up
-      command: "docker-compose up -d mysql"
+      command: "docker-command pull mysql ; docker-compose up -d mysql"
 
 - name: Configure mysql database. Tag=configure_mysql
   hosts: mysql
@@ -31,7 +29,7 @@
     - name: Wait for docker mysql be ready
       wait_for_connection:
 
-    - name: Wait for mysql db to be ready
+    - name: Wait for mysql be ready
       wait_for:
         host: 127.0.0.1
         port: 3306
@@ -175,7 +173,7 @@
 
     - name: Load redirections
       set_fact:
-        uris: "{{ uris }} --redirect_uri=http://{{ item }}.{{ lookup('env', 'DOMAIN') }}.flowdat.com/login_check"
+        uris: "{{ uris }} --redirect_uri=http://{{ item }}.{{ lookup('env', 'CLIENT') }}.flowdat.com/login_check"
       with_items: "{{ lookup('env', 'MODULES_INSTALL').split(',') }}"
 
     - name: Create oauth client

tools/src/Release.php

@@ -260,6 +260,7 @@ class Release extends Command
                 }
                 $this->_domain = $input->getOption("domain");
                 $this->_client = $input->getOption("client");
+                $this->_dir = realpath($dir);
 
                 if (!$this->_client) {
                     $this->_client = basename(realpath($this->directory));
@@ -708,7 +709,7 @@ class Release extends Command
 
         $composer
         ->addService($module)
-        ->image("grafana/grafana:4.6.0")
+        ->image("grafana/grafana:3.1.1")
         ->addLinks("mysql")
         ->restart($this->_docker_restart_default)
         ->addEnv_file("running.env")
@@ -779,6 +780,7 @@ class Release extends Command
         ->addLinks("amqp")
         ->addLinks("nginx", $this->getDomain("base"))
         ->addEnv_file("running.env")
+        ->addEnv_file("hosts.env")
         ->addEnviroment("AMQP_KEY", "base")
         ->addVolumes("./base/", "/opt/base");
 
@@ -807,6 +809,7 @@ class Release extends Command
         ->addLinks("amqp")
         ->addLinks("nginx", $this->getDomain("base"))
         ->addEnv_file("running.env")
+        ->addEnv_file("hosts.env")
         ->addEnviroment("AMQP_KEY", "ftth")
         ->addVolumes("./ftth/", "/opt/ftth");
 
@@ -821,6 +824,7 @@ class Release extends Command
         ->addLinks("amqp")
         ->addLinks("nginx", $this->getDomain("base"))
         ->addEnv_file("running.env")
+        ->addEnv_file("hosts.env")
         ->addEnviroment("AMQP_KEY", "stats")
         ->addVolumes("./stats/", "/opt/stats");
     }