old_contents: '''
  Execute overstate functions
  '''
  
  # Import salt libs
  import salt.overstate
  import salt.output
  
  
  def over(env='base', os_fn=None):
      '''
      Execute an overstate sequence to orchestrate the executing of states
      over a group of systems
      '''
      stage_num = 0
      overstate = salt.overstate.OverState(__opts__, env, os_fn)
      for stage in overstate.stages_iter():
          if isinstance(stage, dict):
              # This is highstate data
              print('Stage execution results:')
              for key, val in stage.items():
                  if '_|-' in key:
                      salt.output.display_output(
                              {'error': {key: val}},
                              'highstate',
                              opts=__opts__)
                  else:
                      salt.output.display_output(
                              {key: val},
                              'highstate',
                              opts=__opts__)
          elif isinstance(stage, list):
              # This is a stage
              if stage_num == 0:
                  print('Executing the following Over State:')
              else:
                  print('Executed Stage:')
              salt.output.display_output(stage, 'overstatestage', opts=__opts__)
              stage_num += 1
      return overstate.over_run
  
  
  def show_stages(env='base', os_fn=None):
      '''
      Display the stage data to be executed
      '''
      overstate = salt.overstate.OverState(__opts__, env, os_fn)
      salt.output.display_output(
              overstate.over,
              'overstatestage',
              opts=__opts__)
      return overstate.over
  
new_contents: '''
  Execute overstate functions
  '''
  
  # Import salt libs
  import salt.overstate
  import salt.output
  
  
  def over(env='base', os_fn=None):
      '''
      Execute an overstate sequence to orchestrate the executing of states
      over a group of systems
      '''
      stage_num = 0
      overstate = salt.overstate.OverState(__opts__, env, os_fn)
      for stage in overstate.stages_iter():
          if isinstance(stage, dict):
              # This is highstate data
              print('Stage execution results:')
              for key, val in stage.items():
                  if '_|-' in key:
                      salt.output.display_output(
                              {'error': {key: val}},
                              'highstate',
                              opts=__opts__)
                  else:
                      salt.output.display_output(
                              {key: val},
                              'highstate',
                              opts=__opts__)
          elif isinstance(stage, list):
              # This is a stage
              if stage_num == 0:
                  print('Executing the following Over State:')
              else:
                  print('Executed Stage:')
              salt.output.display_output(stage, 'overstatestage', opts=__opts__)
              stage_num += 1
      return overstate.over_run
  
  
  def sls(mods, env, test=None, exclude=None):
      '''
      Execute a state run from the master, used as a powerful orchestration
      system.
      '''
      minion = salt.minion.MasterMinion(__opts__)
      ret = minion.functions['state.sls'](mods, env, test, exclude)
      salt.output.display_output(ret, 'highstate', opts=__opts__)
      return ret
  
  
  def show_stages(env='base', os_fn=None):
      '''
      Display the stage data to be executed
      '''
      overstate = salt.overstate.OverState(__opts__, env, os_fn)
      salt.output.display_output(
              overstate.over,
              'overstatestage',
              opts=__opts__)
      return overstate.over
  
subject: Add state.sls runner