Merge lp:~tvansteenburgh/juju-deployer/1575863 into lp:juju-deployer

[Tim Van Steenburgh]

[lp:~tvansteenburgh/juju-deployer/1575863]

172. By Tim Van Steenburgh on 2016-05-03

Fix typo

[Matt Bruzek (mbruzek)]

+1 LGTM

review: Approve

[Marco Ceppi (marcoceppi)]

LGTM +1

review: Approve

=== modified file 'deployer/env/base.py'
--- deployer/env/base.py	2016-03-31 20:08:08 +0000
+++ deployer/env/base.py	2016-05-03 17:28:32 +0000
@@ -1,7 +1,7 @@
 import logging
 
 from ..utils import (
-    _get_juju_home, path_join, yaml_load, ErrorExit,
+    yaml_load, ErrorExit,
     yaml_dump, temp_file, _check_call, get_juju_major_version)
 
 
@@ -9,12 +9,6 @@
 
     log = logging.getLogger("deployer.env")
 
-    @property
-    def env_config_path(self):
-        jhome = _get_juju_home()
-        env_config_path = path_join(jhome, 'environments.yaml')
-        return env_config_path
-
     def _check_call(self, *args, **kwargs):
         if self.options and self.options.retry_count:
             kwargs['max_retry'] = self.options.retry_count
@@ -29,32 +23,10 @@
             params.extend([flag, self.name])
         return params
 
-    def _get_env_config(self):
-        with open(self.env_config_path) as fh:
-            config = yaml_load(fh.read())
-            if self.name:
-                if self.name not in config['environments']:
-                    self.log.error("Environment %r not found", self.name)
-                    raise ErrorExit()
-                return config['environments'][self.name]
-            else:
-                env_name = config.get('default')
-                if env_name is None:
-                    if len(config['environments'].keys()) == 1:
-                        env_name = config['environments'].keys().pop()
-                    else:
-                        self.log.error("Ambigious operation environment")
-                        raise ErrorExit()
-                return config['environments'][env_name]
-
     def _write_config(self, svc_name, config, fh):
         fh.write(yaml_dump({svc_name: config}))
         fh.flush()
 
-#    def _write_config(self, svc_name, config, fh):
-#        fh.write(yaml_dump(config))
-#        fh.flush()
-
     def _get_agent_state(self, entity):
         try:
             return entity['agent-state']
@@ -147,7 +119,7 @@
         try:
             self._check_call(
                 params, self.log, "Error terminating machine %r" % mid)
-        except ErrorExit, e:
+        except ErrorExit as e:
             if ("machine %s does not exist" % mid) in e.error.output:
                 return
             raise
 
=== modified file 'deployer/utils.py'
--- deployer/utils.py	2016-03-31 15:24:20 +0000
+++ deployer/utils.py	2016-05-03 17:28:32 +0000
@@ -121,7 +121,6 @@
     if verbose:
         log_options.update({"loggers": {
             "deployer": {"level": "DEBUG", "propogate": True}}})
-        #log_options.update({"loggers": {""
     if debug:
         log_options.update(
             {"handlers": {"console": {"formatter": "detailed"}}})
@@ -239,10 +238,16 @@
 
 
 def _get_juju_home():
-    jhome = os.environ.get("JUJU_HOME")
-    if jhome is None:
-        jhome = path_join(os.environ.get('HOME'), '.juju')
-    return jhome
+    if get_juju_major_version() == 1:
+        return (
+            os.environ.get("JUJU_HOME") or
+            path_join(os.environ.get('HOME'), '.juju')
+        )
+    return (
+        os.environ.get("JUJU_DATA") or
+        path_join(os.environ.get('HOME'), '.local', 'share', 'juju')
+    )
+
 
 _juju_major_version = None
 def get_juju_major_version():
@@ -274,14 +279,9 @@
             stderr = kw['stderr']
         output = subprocess.check_output(
             params, cwd=cwd, stderr=stderr, env=os.environ, shell=shell)
-    except subprocess.CalledProcessError, e:
+    except subprocess.CalledProcessError as e:
         if 'ignoreerr' in kw:
             return
-        #print "subprocess error"
-        #print " ".join(params), "\ncwd: %s\n" % cwd, "\n ".join(
-        # ["%s=%s" % (k, os.environ[k]) for k in os.environ
-        #     if k.startswith("JUJU")])
-        #print e.output
         log.error(*args)
         log.error("Command (%s) Output:\n\n %s", " ".join(params), e.output)
         if not max_retry or cur > max_retry:
@@ -393,7 +393,7 @@
 
         with open(os.path.join(juju_home, 'environments.yaml')) as fh:
             conf = yaml_load(fh.read())
-            if not 'default' in conf:
+            if 'default' not in conf:
                 raise ValueError("No Environment specified")
             return conf['default']
     else:
 
=== modified file 'setup.py'
--- setup.py	2016-04-05 20:26:10 +0000
+++ setup.py	2016-05-03 17:28:32 +0000
@@ -9,7 +9,7 @@
     author="Kapil Thangavelu",
     author_email="[e-mail]",
     url="http://launchpad.net/juju-deployer",
-    install_requires=["jujuclient>=0.18", "PyYAML>=3.10"],
+    install_requires=["jujuclient>=0.18", "PyYAML>=3.10", "bzr"],
     packages=find_packages(),
     classifiers=[
         "Development Status :: 4 - Beta",