Supporting for forcing upgrades when unit not in started state.

juju/control/upgrade_charm.py

 """Implementation of charm-upgrade subcommand"""
 
 from twisted.internet.defer import inlineCallbacks
 
 from juju.control.utils import get_environment, expand_path
 
 from juju.charm.directory import CharmDirectory
 from juju.charm.errors import NewerCharmNotFound
 from juju.charm.publisher import CharmPublisher
 from juju.charm.repository import resolve
 from juju.charm.url import CharmURL
 
 from juju.state.service import ServiceStateManager
 from juju.unit.workflow import is_unit_running
 
 
 def configure_subparser(subparsers):
     """Configure charm-upgrade subcommand"""
     sub_parser = subparsers.add_parser("upgrade-charm", help=command.__doc__)
     sub_parser.add_argument(
         "--dry-run", "-n", action="store_true",
         help="Dry-Run, show which charm would be deployed for upgrade.")
     sub_parser.add_argument(
+        "--force", action="store_true",
+        help="Force an upgrade, regardless of unit state")
+    sub_parser.add_argument(
         "--environment", "-e",
         help="juju environment to operate in.")
     sub_parser.add_argument(
         "--repository",
         help="Directory for charm lookup and retrieval",
         type=expand_path)
     sub_parser.add_argument(
         "service_name",
         help="Name of the service that should be upgraded")
     return sub_parser
 
 
 def command(options):
     """Upgrade a service's charm."""
     environment = get_environment(options)
     return upgrade_charm(
         options.environments,
         environment,
         options.verbose,
         options.log,
         options.repository,
         options.service_name,
-        options.dry_run)
+        options.dry_run,
+        options.force)
 
 
 @inlineCallbacks
 def upgrade_charm(
-    config, environment, verbose, log, repository_path, service_name, dry_run):
+    config, environment, verbose, log, repository_path, service_name,
+    dry_run, force):

[niemeyer, 2012/03/19 22:15:45]

Isn't there something missing below?

     """Upgrades a service's charm.
 
     First determines if an upgrade is available, then updates the
     service charm reference, and marks the units as needing upgrades.
     """
     provider = environment.get_machine_provider()
     client = yield provider.connect()
 
     service_manager = ServiceStateManager(client)
     service_state = yield service_manager.get_service_state(service_name)
@@ skipping 54 matching lines @@
     for unit in units:
         running, state = yield is_unit_running(client, unit)
         if not running:
             log.info(
                 "Unit %r is not in a running state (state: %r), won't upgrade",
                 unit.unit_name, state or "uninitialized")
             continue
 
         if not dry_run:
             yield unit.set_upgrade_flag()