← Back to branch summary

~james-page/charms/trusty/swift-proxy/lp1531102

« back to all changes in this revision

Viewing changes to hooks/swift_hooks.py

  • Committer: David Ames
  • Date: 2015-09-23 16:28:19 UTC
  • mto: This revision was merged to the branch mainline in revision 113.
  • Revision ID: david.ames@canonical.com-20150923162819-hv3p3nay7mzv65tf
Action managed upgrade

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/swift_hooks.py
132
132
    update_nrpe_config()
133
133
 
134
134
    # Determine whether or not we should do an upgrade.
135
 
    if openstack.openstack_upgrade_available('python-swift'):
 
135
    if not config('action-managed-upgrade') and \
 
136
            openstack.openstack_upgrade_available('python-swift'):
136
137
        do_openstack_upgrade(CONFIGS)
137
138
 
138
139
    update_rings(min_part_hours=config('min-hours'))