← Back to branch summary

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

« back to all changes in this revision

Viewing changes to jujupy.py

  • Committer: Christopher Lee
  • Date: 2016-08-11 02:20:33 UTC
  • mto: This revision was merged to the branch mainline in revision 1547.
  • Revision ID: chris.lee@canonical.com-20160811022033-smolk0x8ortc58qc
Separate out controller update and model. Only update 'self' model not all models under controller

Show diffs side-by-side

added added

removed removed

Lines of Context:
jujupy.py
1683
1683
            version_number += '.1'
1684
1684
        return version_number
1685
1685
 
1686
 
    def upgrade_juju(self, force_version=True):
 
1686
    def upgrade_controller(self, force_version=True):
1687
1687
        args = ()
1688
1688
        if force_version:
1689
1689
            version = self.get_matching_agent_version(no_build=True)
1690
1690
            args += ('--version', version)
1691
1691
        if self.env.local:
1692
1692
            args += ('--upload-tools',)
1693
 
        self._upgrade_juju(args)
1694
 
 
1695
 
    def _upgrade_juju(self, args):
1696
 
        """Upgrades controller and other hosted models.
1697
 
 
1698
 
        Remove --upload-tools from the arguments for non-controller models.
1699
 
 
1700
 
        """
 
1693
 
1701
1694
        self._upgrade_controller(args)
1702
 
        args = filter(lambda x: x != '--upload-tools', args)
1703
 
        models = [m['name']
1704
 
                  for m in self._get_models()
1705
 
                  if m['name'] != 'controller']
1706
 
        for model_name in models:
1707
 
            temp_client = self._acquire_model_client(model_name)
1708
 
            temp_client.juju('upgrade-juju', args)
1709
1695
 
1710
1696
    def _upgrade_controller(self, args):
1711
1697
        controller = self.get_controller_client()
1712
1698
        controller.juju('upgrade-juju', args)
1713
1699
 
 
1700
    def upgrade_juju(self, force_version=True):
 
1701
        args = ()
 
1702
        if force_version:
 
1703
            version = self.get_matching_agent_version(no_build=True)
 
1704
            args += ('--version', version)
 
1705
        self._upgrade_juju(args)
 
1706
 
 
1707
    def _upgrade_juju(self, args):
 
1708
        self.juju('upgrade-juju', args)
 
1709
 
1714
1710
    def upgrade_mongo(self):
1715
1711
        self.juju('upgrade-mongo', ())
1716
1712
 
2296
2292
                    return cmd
2297
2293
        raise JESNotSupported()
2298
2294
 
2299
 
    def _upgrade_juju(self, args):
2300
 
        self.juju('upgrade-juju', args)
 
2295
    def upgrade_juju(self, force_version=True):
 
2296
        args = ()
 
2297
        if force_version:
 
2298
            version = self.get_matching_agent_version(no_build=True)
 
2299
            args += ('--version', version)
 
2300
        if self.env.local:
 
2301
            args += ('--upload-tools',)
 
2302
        self._upgrade_juju(args)
2301
2303
 
2302
2304
    def make_model_config(self):
2303
2305
        config_dict = make_safe_config(self)