Autodeploy inspired on Prototype #2

[genesis.git] / fuel / deploy / cloud / configure_environment.py

diff --git a/fuel/deploy/cloud_deploy/cloud/configure_environment.py b/fuel/deploy/cloud/configure_environment.py
similarity index 75%
rename from fuel/deploy/cloud_deploy/cloud/configure_environment.py
rename to fuel/deploy/cloud/configure_environment.py
index 426bbd1..d0037d7 100644 (file)
--- a/fuel/deploy/cloud_deploy/cloud/configure_environment.py
+++ b/fuel/deploy/cloud/configure_environment.py
@@ -13,7 +13,7 @@ RO = common.RO
 exec_cmd = common.exec_cmd
 parse = common.parse
 err = common.err
-LOG = common.LOG
+log = common.log
 
 class ConfigureEnvironment(object):
 
@@ -21,7 +21,7 @@ class ConfigureEnvironment(object):
         self.env_id = None
         self.dea = dea
         self.yaml_config_dir = yaml_config_dir
-        self.env_name = dea.get_environment_name()
+        self.env_name = self.dea.get_property('environment_name')
         self.release_id = release_id
         self.node_id_roles_dict = node_id_roles_dict
         self.required_networks = []
@@ -35,23 +35,22 @@ class ConfigureEnvironment(object):
         return False
 
     def configure_environment(self):
-        LOG.debug('Configure environment\n')
+        log('Configure environment')
         if os.path.exists(self.yaml_config_dir):
-            LOG.debug('Deleting existing config directory %s\n'
-                  % self.yaml_config_dir)
+            log('Deleting existing config directory %s' % self.yaml_config_dir)
             shutil.rmtree(self.yaml_config_dir)
-        LOG.debug('Creating new config directory %s\n' % self.yaml_config_dir)
+        log('Creating new config directory %s' % self.yaml_config_dir)
         os.makedirs(self.yaml_config_dir)
 
-        LOG.debug('Creating environment %s release %s, mode ha, network-mode '
-              'neutron, net-segment-type vlan\n'
-              % (self.env_name, self.release_id))
-        exec_cmd('fuel env create --name %s --release %s --mode ha '
+        mode = self.dea.get_property('environment_mode')
+        log('Creating environment %s release %s, mode %s, network-mode neutron'
+            ', net-segment-type vlan' % (self.env_name, self.release_id, mode))
+        exec_cmd('fuel env create --name %s --release %s --mode %s '
                  '--network-mode neutron --net-segment-type vlan'
-                 % (self.env_name, self.release_id))
+                 % (self.env_name, self.release_id, mode))
 
         if not self.env_exists(self.env_name):
-            err("Failed to create environment %s\n" % self.env_name)
+            err('Failed to create environment %s' % self.env_name)
         self.config_settings()
         self.config_network()
         self.config_nodes()