Browse Source

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

Fernando Alonso 6 years ago
parent
commit
4ebf3666b4
2 changed files with 3 additions and 1 deletions
  1. 1 1
      tools/readme.md
  2. 2 0
      tools/src/Release.php

+ 1 - 1
tools/readme.md

@@ -16,7 +16,7 @@
     curl https://bootstrap.pypa.io/get-pip.py | python
     curl https://bootstrap.pypa.io/get-pip.py | python
 
 
     # actualizo pip
     # actualizo pip
-    pip install -U pip
+    pip install -U pip setuptools
 
 
 ### docker (Versión funcional: apt-get install docker-ce=17.10.0~ce-0~debian    - Versión con errores: 17.11 )
 ### docker (Versión funcional: apt-get install docker-ce=17.10.0~ce-0~debian    - Versión con errores: 17.11 )
     # con sudo
     # con sudo

+ 2 - 0
tools/src/Release.php

@@ -304,6 +304,7 @@ class Release extends Command
             $this->_ansible_vars["CMD_USERNAME"] = $this->_user_system['users'][$this->internal_user_id]['user'];
             $this->_ansible_vars["CMD_USERNAME"] = $this->_user_system['users'][$this->internal_user_id]['user'];
             $this->_ansible_vars["CMD_PASSWORD"] = $this->_user_system['users'][$this->internal_user_id]['password'];
             $this->_ansible_vars["CMD_PASSWORD"] = $this->_user_system['users'][$this->internal_user_id]['password'];
             $this->_ansible_vars["ENV_LIST"] = "prod,dev,test";
             $this->_ansible_vars["ENV_LIST"] = "prod,dev,test";
+            $this->_ansible_vars["API_CIDR"] = "172.20.0.0/24";
 
 
             $dObj = new DevOps\FileSystem(realpath($this->directory));
             $dObj = new DevOps\FileSystem(realpath($this->directory));
             $dObj->dirExists()->realpath();
             $dObj->dirExists()->realpath();
@@ -663,6 +664,7 @@ class Release extends Command
             ->addVolumes("./extra/supervisord/bin/fiberhome", "/usr/bin/fiberhome")
             ->addVolumes("./extra/supervisord/bin/fiberhome", "/usr/bin/fiberhome")
             ->addVolumes("./extra/supervisord/bin/fiberlink", "/usr/bin/fiberlink")
             ->addVolumes("./extra/supervisord/bin/fiberlink", "/usr/bin/fiberlink")
             ->addVolumes("./extra/supervisord/bin/huawei", "/usr/bin/huawei")
             ->addVolumes("./extra/supervisord/bin/huawei", "/usr/bin/huawei")
+            ->addVolumes("./extra/supervisord/bin/zte", "/usr/bin/zte")
             ->addVolumes("./stats", "/opt/stats")
             ->addVolumes("./stats", "/opt/stats")
             ->addEnv_file("running.env")
             ->addEnv_file("running.env")
             ->addEnv_file($host_env_file)
             ->addEnv_file($host_env_file)