Merge lp:~peter-petrakis/juju-deployer/devel-pydeployto into lp:~gandelman-a/juju-deployer/trunk

[Peter Petrakis]

support force-machine on pyju, example config provided

Unmerged revisions

74. By Peter Petrakis on 2013-09-11

support force-machine on pyju, example config provided

=== added file 'configs/wiki-plus-juju-gui.yaml'
--- configs/wiki-plus-juju-gui.yaml	1970-01-01 00:00:00 +0000
+++ configs/wiki-plus-juju-gui.yaml	2013-09-11 18:16:42 +0000
@@ -0,0 +1,26 @@
+wiki:
+  series: precise
+  services:
+     juju_gui:
+      charm: juju-gui
+      branch: lp:charms/precise/juju-gui
+      force-machine: 0
+      expose: true
+     wiki:
+      charm: mediawiki
+      branch: lp:charms/precise/mediawiki
+      constraints: mem=2
+      num_units: 2
+     db:
+       charm: mysql
+       branch: lp:charms/precise/mysql
+       options:
+         tuning-level: fast
+     haproxy:
+       branch: lp:charms/precise/haproxy
+       expose: true
+     memcached:
+       branch: lp:charms/precise/memcached
+  relations:
+    - ["wiki:db", db]
+    - [wiki, [haproxy, memcached]]

=== modified file 'deployer/env/py.py'
--- deployer/env/py.py	2013-07-30 23:39:51 +0000
+++ deployer/env/py.py	2013-09-11 18:16:42 +0000
@@ -5,6 +5,9 @@
 
 from .base import BaseEnvironment
 
+from ..utils import (
+    _get_juju_home, path_join, yaml_load, ErrorExit, yaml_dump, temp_file,
+    _check_call)
 
 class PyEnvironment(BaseEnvironment):
 
@@ -33,6 +36,34 @@
     def connect(self):
         """ NoOp """
 
+    def deploy(self, name, charm_url,
+               repo=None, config=None,
+               constraints=None, num_units=1, force_machine=None):
+
+        if force_machine is None:
+            return super(PyEnvironment, self).deploy(name, charm_url,
+                    repo, config, constraints, num_units, force_machine)
+
+        params = self._named_env(["jitsu", "deploy-to"])
+        params.extend(["%d" % force_machine])
+
+        #  Silently ignore num_units
+        with temp_file() as fh:
+            if config:
+                fh.write(yaml_dump({name: config}))
+                fh.flush()
+                params.extend(["--config", fh.name])
+            if constraints:
+                params.extend(['--constraints', constraints])
+            if charm_url.startswith('local'):
+                if repo == "":
+                    repo = "."
+                params.extend(["--repository=%s" % repo])
+
+            params.extend([charm_url, name])
+            self._check_call(
+                params, self.log, "Error deploying service %r", name)
+
     def _destroy_service(self, service_name):
         params = self._named_env(["juju", "destroy-service"])
         params.append(service_name)