← Back to branch summary

~veebers/juju-ci-tools/migration-add-migrate-back-to-original

« back to all changes in this revision

Viewing changes to jujupy.py

  • Committer: Christopher Lee
  • Date: 2016-10-06 01:28:20 UTC
  • mto: This revision was merged to the branch mainline in revision 1633.
  • Revision ID: chris.lee@canonical.com-20161006012820-65szepg3i4z3m6n9
Further removal of @local, affecting assess_resources.

Show diffs side-by-side

added added

removed removed

Lines of Context:
jujupy.py
1238
1238
                'Controller and environment names should not vary (yet)')
1239
1239
 
1240
1240
    def update_user_name(self):
1241
 
        self.env.user_name = 'admin@local'
 
1241
        self.env.user_name = 'admin'
1242
1242
 
1243
1243
    def bootstrap(self, upload_tools=False, bootstrap_series=None,
1244
1244
                  credential=None, auto_upgrade=False, metadata_source=None,