old_contents: #!/usr/bin/python
  
  import traceback
  
  from charmhelpers.contrib.openstack.utils import (
      git_install_requested,
  )
  
  from charmhelpers.core.hookenv import (
      action_set,
      action_fail,
      config,
  )
  
  from keystone_utils import (
      git_install,
  )
  
  from keystone_hooks import (
      config_changed,
  )
  
  
  def git_reinstall():
      """Reinstall from source and restart services.
  
      If the openstack-origin-git config option was used to install openstack
      from source git repositories, then this action can be used to reinstall
      from updated git repositories, followed by a restart of services."""
      if not git_install_requested():
          action_fail('openstack-origin-git is not configured')
          return
  
      try:
          git_install(config('openstack-origin-git'))
          config_changed()
      except:
          action_set({'traceback': traceback.format_exc()})
          action_fail('git-reinstall resulted in an unexpected error')
  
  
  if __name__ == '__main__':
      git_reinstall()
  
new_contents: #!/usr/bin/python
  
  import traceback
  
  from charmhelpers.contrib.openstack.utils import (
      git_install_requested,
  )
  
  from charmhelpers.core.hookenv import (
      action_set,
      action_fail,
      config,
  )
  
  from hooks.keystone_utils import (
      git_install,
  )
  
  from hooks.keystone_hooks import (
      config_changed,
  )
  
  
  def git_reinstall():
      """Reinstall from source and restart services.
  
      If the openstack-origin-git config option was used to install openstack
      from source git repositories, then this action can be used to reinstall
      from updated git repositories, followed by a restart of services."""
      if not git_install_requested():
          action_fail('openstack-origin-git is not configured')
          return
  
      try:
          git_install(config('openstack-origin-git'))
          config_changed()
      except:
          action_set({'traceback': traceback.format_exc()})
          action_fail('git-reinstall resulted in an unexpected error')
  
  
  if __name__ == '__main__':
      git_reinstall()
  
subject: Fix import.