ソースを参照

Change docker ip's

gabriel 6 年 前
コミット
ac27cf4cb4
2 ファイル変更6 行追加6 行削除
  1. 4 4
      tools/src/ReleaseImages.php
  2. 2 2
      tools/src/UpdateImages.php

+ 4 - 4
tools/src/ReleaseImages.php

@@ -243,7 +243,7 @@ class ReleaseImages extends Command
             ->addOption('host_ip', null, InputOption::VALUE_REQUIRED, 'Ip of the runnning host to be added to the /etc/hosts file, eventually', "127.0.1.1")
             ->addOption('host_ip', null, InputOption::VALUE_REQUIRED, 'Ip of the runnning host to be added to the /etc/hosts file, eventually', "127.0.1.1")
             ->addOption('domain', null, InputOption::VALUE_REQUIRED, 'Domain where the flowdat will be installed', "flowdat.net")
             ->addOption('domain', null, InputOption::VALUE_REQUIRED, 'Domain where the flowdat will be installed', "flowdat.net")
             ->addOption('client', null, InputOption::VALUE_REQUIRED, 'Client name, if is not provided uses, the dirname of the installation', false)
             ->addOption('client', null, InputOption::VALUE_REQUIRED, 'Client name, if is not provided uses, the dirname of the installation', false)
-            ->addOption('ip_network_begin', null, InputOption::VALUE_OPTIONAL, 'Flowdat ip network configuration', "172.172.172.0")
+            ->addOption('ip_network_begin', null, InputOption::VALUE_OPTIONAL, 'Flowdat ip network configuration', "172.16.0.0")
             ->addOption('branch', null, InputOption::VALUE_OPTIONAL, 'Branch to install. Ej. v0.1.1', "latest")
             ->addOption('branch', null, InputOption::VALUE_OPTIONAL, 'Branch to install. Ej. v0.1.1', "latest")
             ->addOption('develop', null, InputOption::VALUE_OPTIONAL, 'If true or 1 then install images and source code.', false);
             ->addOption('develop', null, InputOption::VALUE_OPTIONAL, 'If true or 1 then install images and source code.', false);
     }
     }
@@ -296,7 +296,7 @@ class ReleaseImages extends Command
             $this->_ansible_vars["CMD_USERNAME"] = $this->_user_system['users'][$internal_user_id]['user'];
             $this->_ansible_vars["CMD_USERNAME"] = $this->_user_system['users'][$internal_user_id]['user'];
             $this->_ansible_vars["CMD_PASSWORD"] = $this->_user_system['users'][$internal_user_id]['password'];
             $this->_ansible_vars["CMD_PASSWORD"] = $this->_user_system['users'][$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.172.172.0/24";
+            $this->_ansible_vars["API_CIDR"] = "172.16.0.0/16";
             $this->_ansible_vars["IK_SUBRED"] = "200.50.160.0/21";
             $this->_ansible_vars["IK_SUBRED"] = "200.50.160.0/21";
             $this->_ansible_vars["MYSQL_ROOT_PASSWORD"] = $this->_mysql_root_pass;
             $this->_ansible_vars["MYSQL_ROOT_PASSWORD"] = $this->_mysql_root_pass;
 
 
@@ -483,7 +483,7 @@ class ReleaseImages extends Command
         $composer = new FileFormat("../", "3.7");
         $composer = new FileFormat("../", "3.7");
         $this->registerVolumes($composer);
         $this->registerVolumes($composer);
         $nc = new NetworkConfig();
         $nc = new NetworkConfig();
-        $nc->addDriver()->addSubnetGateway("172.172.172.0/24");
+        $nc->addDriver()->addSubnetGateway("172.16.0.0/16");
         $composer->getNetwork()->addDriver($this->_network_name)->addConfig($this->_network_name, $nc);
         $composer->getNetwork()->addDriver($this->_network_name)->addConfig($this->_network_name, $nc);
 
 
         $base_vars = array(
         $base_vars = array(
@@ -865,4 +865,4 @@ class ReleaseImages extends Command
     {
     {
         return array_key_exists($object->getModuleName(), $this->_modules);
         return array_key_exists($object->getModuleName(), $this->_modules);
     }
     }
-}
+}

+ 2 - 2
tools/src/UpdateImages.php

@@ -116,7 +116,7 @@ class UpdateImages extends ReleaseImages
             $this->_ansible_vars["CMD_USERNAME"] = $this->_user_system['users'][$internal_user_id]['user'];
             $this->_ansible_vars["CMD_USERNAME"] = $this->_user_system['users'][$internal_user_id]['user'];
             $this->_ansible_vars["CMD_PASSWORD"] = $this->_user_system['users'][$internal_user_id]['password'];
             $this->_ansible_vars["CMD_PASSWORD"] = $this->_user_system['users'][$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.172.172.0/24";
+            $this->_ansible_vars["API_CIDR"] = "172.16.0.0/16";
             $this->_ansible_vars["IK_SUBRED"] = "200.50.160.0/21";
             $this->_ansible_vars["IK_SUBRED"] = "200.50.160.0/21";
             $this->_ansible_vars["MYSQL_ROOT_PASSWORD"] = $this->_mysql_root_pass;
             $this->_ansible_vars["MYSQL_ROOT_PASSWORD"] = $this->_mysql_root_pass;
 
 
@@ -224,4 +224,4 @@ class UpdateImages extends ReleaseImages
         $this->_ansible_vars["MODULES_INSTALL"] = "base," . substr($oautModules, 0, strlen($oautModules) - 1);
         $this->_ansible_vars["MODULES_INSTALL"] = "base," . substr($oautModules, 0, strlen($oautModules) - 1);
     }
     }
 
 
-}
+}