FD3-344 fix domain

tools/src/Release.php

@@ -21,42 +21,47 @@ class Release extends Command
      * @var string Nombre del archivo de log.
      */
     private $_running_log;
+
     /**
      * @var string Contiene la politica de restart de los dockers.
      */
     private $_docker_restart_default;
+
     /**
      * @var array Contiene las variables que se utilizar en la ejecucion del ansible.
      */
     private $_ansible_vars;
+
     /**
      * @var string Contiene el password del usuario root.
      */
     private $_mysql_root_pass;
+
     /**
      * @var string Contiene el usuario de base de datos.
      */
     private $_mysql_user;
+
     /**
      * @var string Contiene la contrasena del  usuario de base de datos.
      */
     private $_mysql_pass;
+
     /**
      * @var DevOps\FileSystem Me permite crear archivos.
      */
     private $_dObj;
+
     /**
      * @var string Contiene el dominio.
      */
     private $_domain;
-    /**
-     * @var string Contiene el dominio que se agrega al final de la linea.
-     */
-    private $_domain_behind;
+
     /**
      * @var array Contiene todos los modulos para la instalacion.
      */
     private $_modules_all;
+
     /**
      * @var array Contiene la configuracion de los modulos.
      */
@@ -76,7 +81,6 @@ class Release extends Command
         $this->_mysql_user = "iksop";
         $this->_mysql_pass = "235r2342gtfsw";
         $this->_mysql_root_pass = "235r2342gtfsw";
-        $this->_domain_behind = "flowdat.com";
         $this->_docker_restart_default = "on-failure:10";
         $this->_modules = array();
         $this->_ansible_vars = array();
@@ -236,9 +240,9 @@ class Release extends Command
             }
             $this->_domain = $input->getOption("domain");
             $this->_client = $input->getOption("client");
-	    if(!$this->_client){
-		$this->_client = basename(realpath($dir));
-	    }
+	        if (!$this->_client) {
+                $this->_client = basename(realpath($dir));
+	        }
             $docker_tag = $input->getOption("docker-tag");
 
             $this->_ansible_vars["DOMAIN"] = $this->_domain;
@@ -650,7 +654,8 @@ class Release extends Command
         $host_env_file = "";
         extract($config);
         if (array_key_exists($module, $this->_modules)) {
-            $composer->addService("phpmyadmin")->image("phpmyadmin/phpmyadmin")
+            $composer->addService("phpmyadmin")
+                ->image("phpmyadmin/phpmyadmin")
                 ->restart($this->_docker_restart_default)
                 ->addPorts(8080, 80)
                 ->addLinks("mysql", "db")
@@ -1022,7 +1027,7 @@ class Release extends Command
      */
     private function getDomain($module)
     {
-        return $module . "." . $this->_domain . "." . $this->_domain_behind;
+        return $module . "." . $this->_client . "." . $this->_domain;
     }
 
     /**

tools/test/base.host.env

@@ -1,2 +1,2 @@
-VIRTUAL_HOST=base.flowdat.com.flowdat.com
+VIRTUAL_HOST=base.test.flowdat.com
 HTTPS_METHOD=nohttps

tools/test/cablemodem.host.env

@@ -0,0 +1,2 @@
+VIRTUAL_HOST=cablemodem.test.flowdat.com
+HTTPS_METHOD=nohttps

tools/test/dhcp.host.env

@@ -0,0 +1,2 @@
+VIRTUAL_HOST=dhcp.test.flowdat.com
+HTTPS_METHOD=nohttps

tools/test/docker-compose.yml

@@ -22,6 +22,7 @@ services:
       - 'mysql:mysql'
       - amqp
     env_file:
+      - running.env
       - host.env
       - base.host.env
     volumes:
@@ -33,8 +34,9 @@ services:
       - 'mysql:mysql'
       - base
       - amqp
-      - 'base:base.flowdat.com.flowdat.com'
+      - 'base:base.test.flowdat.com'
     env_file:
+      - running.env
       - host.env
       - ftth.host.env
       - ftth.oauth.env
@@ -47,10 +49,11 @@ services:
       - 'mysql:mysql'
       - base
       - amqp
-      - 'base:base.flowdat.com.flowdat.com'
+      - 'base:base.test.flowdat.com'
     volumes:
       - './stats/:/opt/stats'
     env_file:
+      - running.env
       - host.env
       - stats.host.env
       - stats.oauth.env
@@ -61,14 +64,31 @@ services:
       - 'mysql:mysql'
       - base
       - amqp
-      - 'base:base.flowdat.com.flowdat.com'
+      - 'base:base.test.flowdat.com'
     env_file:
+      - running.env
       - host.env
       - mapas.host.env
       - mapas.oauth.env
     volumes:
       - './mapas/:/opt/mapas'
       - './mapas/web/uploads:/opt/mapas/web/uploads'
+  cablemodem:
+    image: 'docker.infra.flowdat.com/fd3/cablemodem:latest'
+    restart: 'on-failure:10'
+    links:
+      - 'mysql:mysql'
+      - base
+      - amqp
+      - 'base:base.test.flowdat.com'
+    env_file:
+      - running.env
+      - host.env
+      - cablemodem.host.env
+      - cablemodem.oauth.env
+    volumes:
+      - './cablemodem/:/opt/cablemodem'
+      - './cablemodem/web/uploads:/opt/cablemodem/web/uploads'
   radius:
     image: 'docker.infra.flowdat.com/fd3/radius:latest'
     restart: 'on-failure:10'
@@ -76,13 +96,29 @@ services:
       - 'mysql:mysql'
       - base
       - amqp
-      - 'base:base.flowdat.com.flowdat.com'
+      - 'base:base.test.flowdat.com'
     env_file:
+      - running.env
       - host.env
       - radius.host.env
       - radius.oauth.env
     volumes:
       - './radius/:/opt/radius'
+  dhcp:
+    image: 'docker.infra.flowdat.com/fd3/dhcp:latest'
+    restart: 'on-failure:10'
+    links:
+      - 'mysql:mysql'
+      - base
+      - amqp
+      - 'base:base.test.flowdat.com'
+    env_file:
+      - running.env
+      - host.env
+      - dhcp.host.env
+      - dhcp.oauth.env
+    volumes:
+      - './dhcp/:/opt/dhcp'
   mysql:
     image: 'docker.infra.flowdat.com/fd3/mysql:latest'
     build:
@@ -217,7 +253,7 @@ services:
       - mysql
       - base
       - amqp
-      - 'nginx:base.flowdat.com.flowdat.com'
+      - 'nginx:base.test.flowdat.com'
     volumes:
       - './base/:/opt/base'
   ftth_command_worker:
@@ -230,7 +266,7 @@ services:
       - mysql
       - base
       - amqp
-      - 'nginx:base.flowdat.com.flowdat.com'
+      - 'nginx:base.test.flowdat.com'
     volumes:
       - './ftth/:/opt/ftth'
   ftth_tasklogger_worker:
@@ -243,7 +279,7 @@ services:
       - mysql
       - base
       - amqp
-      - 'nginx:base.flowdat.com.flowdat.com'
+      - 'nginx:base.test.flowdat.com'
     volumes:
       - './ftth/:/opt/ftth'
   stats_command_worker:

tools/test/ftth.host.env

@@ -1,2 +1,2 @@
-VIRTUAL_HOST=ftth.flowdat.com.flowdat.com
+VIRTUAL_HOST=ftth.test.flowdat.com
 HTTPS_METHOD=nohttps

tools/test/git.ini

@@ -6,10 +6,6 @@ branch = "master"
 url = "git@bitbucket.org:ikflowdat/ftth.git"
 branch = "master"
 
-[stats]
-url = "git@bitbucket.org:ikflowdat/stats.git"
-branch = "master"
-
 [mapas]
 url = "git@bitbucket.org:ikflowdat/mapas.git"
 branch = "master"
@@ -17,3 +13,19 @@ branch = "master"
 [radius]
 url = "git@bitbucket.org:ikflowdat/radius.git"
 branch = "master"
+
+[stats]
+url = "git@bitbucket.org:ikflowdat/stats.git"
+branch = "master"
+
+[cablemodem]
+url = "git@bitbucket.org:ikflowdat/cablemodem.git"
+branch = "master"
+
+[dhcp]
+url = "git@bitbucket.org:ikflowdat/dhcp.git"
+branch = "master"
+
+[extra]
+url = "git@bitbucket.org:ikflowdat/extra.git"
+branch = "master"

tools/test/grafana.host.env

@@ -1,4 +1,4 @@
-VIRTUAL_HOST=grafana.flowdat.com.flowdat.com
+VIRTUAL_HOST=grafana.test.flowdat.com
 HTTPS_METHOD=nohttps
 GF_SECURITY_ADMIN_PASSWORD=queRini6
 GF_INSTALL_PLUGINS=grafana-simple-json-datasource
@@ -7,4 +7,4 @@ 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://grafana.flowdat.com.flowdat.com/
+GF_SERVER_ROOT_URL=http://grafana.test.flowdat.com/

tools/test/host.env

@@ -1,6 +1,8 @@
-HOST_GRAFANA=grafana.flowdat.com.flowdat.com
-HOST_BASE=base.flowdat.com.flowdat.com
-HOST_FTTH=ftth.flowdat.com.flowdat.com
-HOST_STATS=stats.flowdat.com.flowdat.com
-HOST_MAPAS=mapas.flowdat.com.flowdat.com
-HOST_RADIUS=radius.flowdat.com.flowdat.com
+HOST_BASE=base.test.flowdat.com
+HOST_FTTH=ftth.test.flowdat.com
+HOST_MAPAS=mapas.test.flowdat.com
+HOST_RADIUS=radius.test.flowdat.com
+HOST_STATS=stats.test.flowdat.com
+HOST_CABLEMODEM=cablemodem.test.flowdat.com
+HOST_DHCP=dhcp.test.flowdat.com
+HOST_GRAFANA=grafana.test.flowdat.com

tools/test/hostsFile

@@ -1,6 +1,8 @@
-127.0.1.1	grafana.flowdat.com.flowdat.com
-127.0.1.1	base.flowdat.com.flowdat.com
-127.0.1.1	ftth.flowdat.com.flowdat.com
-127.0.1.1	stats.flowdat.com.flowdat.com
-127.0.1.1	mapas.flowdat.com.flowdat.com
-127.0.1.1	radius.flowdat.com.flowdat.com
+127.0.1.1	base.test.flowdat.com
+127.0.1.1	ftth.test.flowdat.com
+127.0.1.1	mapas.test.flowdat.com
+127.0.1.1	radius.test.flowdat.com
+127.0.1.1	stats.test.flowdat.com
+127.0.1.1	cablemodem.test.flowdat.com
+127.0.1.1	dhcp.test.flowdat.com
+127.0.1.1	grafana.test.flowdat.com

tools/test/install.yml

@@ -1,3 +1,3 @@
 install_dir: /var/flowdat/flowdat3/installer/tools/test
-docker_apps: 'base,flowdat.com,ftth,stats,mapas,radius'
+docker_apps: 'base,flowdat.com,test,ftth,mapas,radius,stats,cablemodem,dhcp'
 domain: flowdat.com

tools/test/inventory.ini

@@ -13,9 +13,15 @@ flowdat.com_stats_1
 [mapas]
 flowdat.com_mapas_1
 
+[cablemodem]
+flowdat.com_cablemodem_1
+
 [radius]
 flowdat.com_radius_1
 
+[dhcp]
+flowdat.com_dhcp_1
+
 [mysql]
 flowdat.com_mysql_1
 
@@ -79,7 +85,9 @@ flowdat.com_base_1
 flowdat.com_ftth_1
 flowdat.com_stats_1
 flowdat.com_mapas_1
+flowdat.com_cablemodem_1
 flowdat.com_radius_1
+flowdat.com_dhcp_1
 flowdat.com_mysql_1
 flowdat.com_amqp_1
 flowdat.com_mongodb_1

tools/test/mapas.host.env

@@ -1,2 +1,2 @@
-VIRTUAL_HOST=mapas.flowdat.com.flowdat.com
+VIRTUAL_HOST=mapas.test.flowdat.com
 HTTPS_METHOD=nohttps

tools/test/playbook.yml

@@ -32,11 +32,22 @@
         connect_timeout: 15
         timeout: 360
 
+    - name: Create database fd_session
+      mysql_db:
+        name: fd_session
+        login_password: "{{ lookup('env', 'MYSQL_PASSWORD') }}"
+        state: present
+
+    - copy:
+        src: "{{ playbook_dir }}/mysql_scripts.sql"
+        dest: /tmp/mysql_scripts.sql
+
     - name: Run SQL commands against DB to create table
       mysql_db:
         login_password: "{{ lookup('env', 'MYSQL_PASSWORD') }}"
         state: import
-        target: "{{ playbook_dir }}/mysql_scripts.sql"
+        name: fd3_session
+        target: "/tmp/mysql_scripts.sql"
 
     - name: Create database base
       mysql_db:
@@ -62,6 +73,24 @@
         login_password: "{{ lookup('env', 'MYSQL_PASSWORD') }}"
         state: present
 
+    - name: Create database cablemodem
+      mysql_db:
+        name: fd3_cablemodem
+        login_password: "{{ lookup('env', 'MYSQL_PASSWORD') }}"
+        state: present
+
+    - name: Create database Radius
+      mysql_db:
+        name: fd3_radius
+        login_password: "{{ lookup('env', 'MYSQL_PASSWORD') }}"
+        state: present
+
+    - name: Create database dhcp
+      mysql_db:
+        name: fd3_dhcp
+        login_password: "{{ lookup('env', 'MYSQL_PASSWORD') }}"
+        state: present
+
     - name: Create user iksop
       mysql_user:
         name: 'iksop'
@@ -92,10 +121,6 @@
         sleep: 30
         timeout: 600
 
-    - name: "Wait for finished the process cache:clear"
-      pause:
-        minutes: 1
-
     - name: Doctrine schema update
       shell: "bin/console doctrine:schema:update --force"
 
@@ -104,11 +129,6 @@
         uris: "{{ uris }} --redirect_uri=http://{{ item }}.{{ lookup('env', 'DOMAIN') }}.flowdat.com/login_check"
       with_items: "{{ lookup('env', 'MODULES_INSTALL').split(',') }}"
 
-    - name: Sacar el update de ik, el base no tiene esta version del oauth
-      shell: "eval $(ssh-agent);ssh-add /opt/keys/bitbucket.id_rsa;composer update ik/*"
-      args:
-        executable: /bin/bash
-
     - name: Create oauth client
       shell: "bin/console oauth:client:createRedirects {{ uris }} > oauth.data.log"
       args:
@@ -167,10 +187,6 @@
   connection: docker
   tags: dsu_modules
   tasks:
-    - name: "Wait for finished the process cache:clear"
-      pause:
-        minutes: 1
-
     - name: "Doctrine schema update"
       shell: "bin/console doctrine:schema:update --force"
 

tools/test/radius.host.env

@@ -1,2 +1,2 @@
-VIRTUAL_HOST=radius.flowdat.com.flowdat.com
+VIRTUAL_HOST=radius.test.flowdat.com
 HTTPS_METHOD=nohttps

tools/test/running.env

@@ -1,2 +1,3 @@
 DOMAIN=flowdat.com
-MODULES_INSTALL=ftth,stats,mapas,radius
+CLIENT=test
+MODULES_INSTALL=ftth,mapas,radius,stats,cablemodem,dhcp

tools/test/running.log

@@ -1,5 +1,5 @@
 [Running]
-date = "2017-12-13 02:14:44"
+date = "2017-12-13 02:42:53"
 
 [Arguments]
 command = "make:install"
@@ -32,7 +32,8 @@ extra-ref = "master"
 extra-build = "false"
 host-ip = "127.0.1.1"
 domain = "flowdat.com"
-modules = "grafana,base,ftth,stats,mapas,radius"
+client = 0
+modules = "base,ftth,mapas,radius,stats,cablemodem,dhcp,grafana,extra"
 inventory = 1
 docker-tag = "latest"
 help = 0

tools/test/stats.host.env

@@ -1,2 +1,2 @@
-VIRTUAL_HOST=stats.flowdat.com.flowdat.com
+VIRTUAL_HOST=stats.test.flowdat.com
 HTTPS_METHOD=nohttps