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

[Peter Petrakis]

- Implemented "expose" functionality
- Fixed configs/wiki.yaml, haproxy is exposed by default

[Adam Gandelman (gandelman-a)]

Since the expose CLI interface is the same between py + go, can you instead add the expose functionality to env/base.py? Then we get it implemented for both environments.

Also:

50 + def expose(self, service_name, do_expose):
51 + params = self._named_env(["juju", "expose"])
52 + params.append(service_name)
53 + if not do_expose:
54 + return
55 + self._check_call(
56 + params, self.log, "Error exposing service %s" % service_name)

The 'do_expose' parameter and check seem redundant since this is already being checked by the caller in importer.

review: Needs Fixing

[Kapil Thangavelu (hazmat)]

merging with some changes ala py + go support (go support via api call, py support in base env).

review: Approve

Unmerged revisions

74. By Peter Petrakis on 2013-09-11

Implement pyju expose

=== modified file 'configs/wiki.yaml'
--- configs/wiki.yaml	2013-07-12 12:52:59 +0000
+++ configs/wiki.yaml	2013-09-11 18:15:17 +0000
@@ -1,7 +1,7 @@
 wiki:
   series: precise
   services:
-    wiki:
+     wiki:
       charm: mediawiki
       branch: lp:charms/precise/mediawiki
       constraints: mem=2
@@ -13,12 +13,9 @@
          tuning-level: fast
      haproxy:
        branch: lp:charms/precise/haproxy
-       options:
-         request-limit: 32
+       expose: true
      memcached:
        branch: lp:charms/precise/memcached
-       options:
-         request-limit: 32
   relations:
-    - ["wiki:db", mysql]
+    - ["wiki:db", db]
     - [wiki, [haproxy, memcached]]

=== modified file 'deployer/action/importer.py'
--- deployer/action/importer.py	2013-07-31 01:54:20 +0000
+++ deployer/action/importer.py	2013-09-11 18:15:17 +0000
@@ -72,7 +72,8 @@
                 svc.force_machine)
 
             if svc.expose:
-                self.env.expose(svc.name)
+                self.log.info(" Exposing service %r" % svc.name)
+                self.env.expose(svc.name, svc.expose)
 
             if self.options.deploy_delay:
                 self.log.debug(" Waiting for deploy delay")

=== 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:15:17 +0000
@@ -39,6 +39,14 @@
         self._check_call(
             params, self.log, "Error destroying service %s" % service_name)
 
+    def expose(self, service_name, do_expose):
+        params = self._named_env(["juju", "expose"])
+        params.append(service_name)
+        if not do_expose:
+            return
+        self._check_call(
+            params, self.log, "Error exposing service %s" % service_name)
+
     def get_config(self, svc_name):
         params = self._named_env(["juju", "get"])
         params.append(svc_name)