Autodeploy inspired on Prototype #2

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

diff --git a/fuel/deploy/cloud_deploy/cloud/configure_settings.py b/fuel/deploy/cloud/configure_settings.py
similarity index 52%
rename from fuel/deploy/cloud_deploy/cloud/configure_settings.py
rename to fuel/deploy/cloud/configure_settings.py
index 3a3e4d5..ac0afdc 100644 (file)
--- a/fuel/deploy/cloud_deploy/cloud/configure_settings.py
+++ b/fuel/deploy/cloud/configure_settings.py
@@ -10,7 +10,7 @@ exec_cmd = common.exec_cmd
 parse = common.parse
 err = common.err
 check_file_exists = common.check_file_exists
-LOG = common.LOG
+log = common.log
 
 class ConfigureSettings(object):
 
@@ -20,28 +20,28 @@ class ConfigureSettings(object):
         self.dea = dea
 
     def download_settings(self):
-        LOG.debug('Download settings for environment %s\n' % self.env_id)
-        r, c = exec_cmd('fuel settings --env %s --download --dir %s'
-                        % (self.env_id, self.yaml_config_dir))
+        log('Download settings for environment %s' % self.env_id)
+        exec_cmd('fuel settings --env %s --download --dir %s'
+                 % (self.env_id, self.yaml_config_dir))
 
     def upload_settings(self):
-        LOG.debug('Upload settings for environment %s\n' % self.env_id)
-        r, c = exec_cmd('fuel settings --env %s --upload --dir %s'
-                        % (self.env_id, self.yaml_config_dir))
+        log('Upload settings for environment %s' % self.env_id)
+        exec_cmd('fuel settings --env %s --upload --dir %s'
+                 % (self.env_id, self.yaml_config_dir))
 
     def config_settings(self):
-        LOG.debug('Configure settings\n')
+        log('Configure settings')
         self.download_settings()
         self.modify_settings()
         self.upload_settings()
 
     def modify_settings(self):
-        LOG.debug('Modify settings for environment %s\n' % self.env_id)
-        settings_yaml = (self.yaml_config_dir + '/settings_%s.yaml'
-                         % self.env_id)
+        log('Modify settings for environment %s' % self.env_id)
+        settings_yaml = ('%s/settings_%s.yaml'
+                         % (self.yaml_config_dir, self.env_id))
         check_file_exists(settings_yaml)
 
-        settings = self.dea.get_settings()
+        settings = self.dea.get_property('settings')
 
         with io.open(settings_yaml, 'w') as stream:
             yaml.dump(settings, stream, default_flow_style=False)