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

[Peter Petrakis]

Adds -B/--bootstrap

Will create target environment and block until it's ready to communicate

[Adam Gandelman (gandelman-a)]

This looks good. Merging with a slightly modified help msg.

review: Approve

[Kapil Thangavelu (hazmat)]

Modified to use get_cli_status() so that it works with go environments as well.

Unmerged revisions

74. By Peter Petrakis on 2013-09-11

Bootstrap sync feature

=== 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:16:07 +0000
@@ -133,6 +133,8 @@
 
     def run(self):
         self.start_time = time.time()
+        if self.options.bootstrap:
+            self.env.bootstrap()
         self.env.connect()
 
         # Get charms

=== modified file 'deployer/cli.py'
--- deployer/cli.py	2013-08-22 00:57:51 +0000
+++ deployer/cli.py	2013-09-11 18:16:07 +0000
@@ -66,6 +66,11 @@
         help='Update vcs branches and exit.',
         dest="branch_only")
     parser.add_argument(
+        '-B', '--bootstrap',
+        help=('Bootstrap specified environment, blocks until ready'),
+        dest="bootstrap", action="store_true",
+        default=False)
+    parser.add_argument(
         '-s', '--deploy-delay', action='store', type=float,
         help=("Time in seconds to sleep between 'deploy' commands, "
               "to allow machine provider to process requests. On "

=== modified file 'deployer/env/base.py'
--- deployer/env/base.py	2013-07-30 23:39:51 +0000
+++ deployer/env/base.py	2013-09-11 18:16:07 +0000
@@ -64,6 +64,15 @@
                         units.append(uid)
         return units
 
+    def bootstrap(self):
+        self.log.info("bootstraping, this might take a while...")
+        params = self._named_env(["juju", "bootstrap"])
+        self._check_call(
+            params, self.log, "Failed to bootstrap")
+               
+        status = self.status() #  block until topology is returned
+        self.log.info(" Bootstrap complete")
+
     def deploy(self, name, charm_url,
                repo=None, config=None,
                constraints=None, num_units=1, force_machine=None):