Merge branch 'master' of bitbucket.org:ikflowdat/installer

tools/grafana.env

@@ -6,5 +6,5 @@ GF_DEFAULT_THEME=light
 GF_AUTH_ANONYMOUS_ORG_NAME="Main Org."
 GF_AUTH_ANONYMOUS_ORG_ROLE=Viewer
 GF_AUTH_ANONYMOUS_ENABLED=true
-GF_DATABASE_URL="mysql://root:235r2342gtfsw@mysql:3306/grafana"
-GF_SERVER_ROOT_URL=http://${VIRTUAL_HOST}/
+GF_DATABASE_URL=mysql://root:235r2342gtfsw@mysql:3306/grafana
+GF_SERVER_ROOT_URL=http://grafana.${CLIENT}.flowdat.com/

tools/playbook.yml

@@ -212,7 +212,7 @@
         executable: /bin/bash
 
     - name: Promote users to IKSOP
-      shell: " bin/console fos:user:promote iksop SUPER_ADMIN"
+      shell: " bin/console fos:user:promote iksop ROLE_SUPER_ADMIN"
       args:
         executable: /bin/bash
 

tools/src/Release.php

@@ -772,7 +772,7 @@ class Release extends Command
 
         $composer
             ->addService($module)
-            ->image("grafana/grafana:3.1.1")
+            ->image("grafana/grafana:5.0.4")
             ->addLinks("mysql")
             ->restart($this->_docker_restart_default)
             ->addEnv_file("running.env")
@@ -950,6 +950,26 @@ class Release extends Command
             ->addPorts(8081, 8080);
     }
 
+    /**
+     * @param FileFormat2 $composer
+     * @param array $config
+     */
+    public function addKea(FileFormat2 $composer, $config = array())
+    {
+        $version = "latest";
+        $registry = "";
+        extract($config);
+
+        $composer
+            ->addService("kea")
+            ->image($registry . "fd3/kea:" . $version)
+            ->build("./extra/kea/")
+            ->restart($this->_docker_restart_default)
+            ->addEnv_file("running.env")
+            ->addEnv_file("host.env")
+            ;
+    }
+
 
     function getDockerComposer($version = "latest", $host_env_file = "host.env", $registry = "docker.infra.flowdat.com/")
     {
@@ -996,6 +1016,9 @@ class Release extends Command
         // Geoserver
         $this->addGeoserver($composer, $base_vars);
 
+        // Kea
+        $this->addKea($composer, $base_vars);
+
         $this->_dObj->file("docker-compose.yml")->content($composer->render());
 
         // escribo un archivo inventory.ini por defecto para no tener que lanzar los docker