← Back to branch summary

~andrewjbeach/juju-ci-tools/make-local-patcher

« back to all changes in this revision

Viewing changes to run_deployer.py

  • Committer: Aaron Bentley
  • Date: 2016-07-08 14:26:06 UTC
  • mfrom: (1465.1.14 client-from-config-5)
  • mto: This revision was merged to the branch mainline in revision 1509.
  • Revision ID: aaron.bentley@canonical.com-20160708142606-4x5rpd5c9jw9bn6n
Merged client-from-config-5 into client-from-config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
run_deployer.py
127
127
    args = parse_args(argv)
128
128
    configure_logging(args.verbose)
129
129
    start_juju_path = None if args.upgrade else args.juju_bin
130
 
    client = client_from_config(args.env, start_juju_path, debug=args.debug,
131
 
                                soft_deadline=args.deadline)
 
130
    client = client_from_config(args.env, start_juju_path, debug=args.debug)
132
131
    with boot_context(args.temp_env_name, client, None, [], args.series,
133
132
                      args.agent_url, args.agent_stream, args.logs,
134
133
                      args.keep_env, upload_tools=args.upload_tools,