← Back to branch summary

~abentley/juju-ci-tools/client-from-config-4

« back to all changes in this revision

Viewing changes to cloud_deploy.py

  • Committer: Aaron Bentley
  • Date: 2016-03-18 14:47:06 UTC
  • mto: This revision was merged to the branch mainline in revision 1324.
  • Revision ID: aaron.bentley@canonical.com-20160318144706-z7wy9c21m3psi6g5
Introduce set_model_name, update tests, check controller on bootstrap.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cloud_deploy.py
7
7
import sys
8
8
from time import sleep
9
9
 
10
 
from jujucharm import (
11
 
    local_charm_path,
12
 
)
13
10
from jujupy import (
14
11
    CannotConnectEnv,
15
12
    EnvJujuClient,
61
58
                client.get_status()
62
59
            client.wait_for_started()
63
60
            if deploy_charm:
64
 
                series = client.env.config.get('default-series', 'trusty')
65
 
                charm_path = local_charm_path(
66
 
                    'dummy-source', juju_ver=client.version, series=series)
67
 
                client.deploy(charm_path, series=series)
 
61
                client.deploy('local:{}/dummy-source'.format(
 
62
                    client.env.config.get('default-series', 'trusty')))
68
63
                client.wait_for_started()
69
64
        except subprocess.CalledProcessError as e:
70
65
            if getattr(e, 'stderr', None) is not None: