Projet

Général

Profil

0004-agent-use-common-code-to-deploy-combo-6461.patch

Frédéric Péters, 10 février 2015 11:30

Télécharger (1,45 ko)

Voir les différences: 

Subject: [PATCH 4/4] agent: use common code to deploy combo (#6461)


 hobo/agent/services.py | 8 ++++++++
 hobo/settings.py       | 3 +++
 2 files changed, 11 insertions(+)
hobo/agent/services.py
89 89 
                stdin=subprocess.PIPE, stdout=subprocess.PIPE)
90 90 
        stdout = cmd_process.communicate(input=json.dumps(environment))
91 91 

  		




  
  92
  
    

  		




  
  93
  
    
class Combo(BaseService):

  		




  
  94
  
    
    service_id = 'combo'

  		




  
  95
  
    
    service_settings_env = 'COMBO_SETTINGS_FILE'

  		




  
  96
  
    
    service_manage_cmd = settings.COMBO_MANAGE_COMMAND

  		




  
  97
  
    
    service_settings_file = settings.COMBO_SETTINGS_FILE

  		




  
  98
  
    

  		




  
  99
  
    

  		




  92
  100
  
    
def deploy(environment):

  		




  93
  101
  
    
    hobo_timestamp = environment.get('timestamp')

  		




  94
  102
  
    

  		












  

    
      hobo/settings.py
    
  





  131
  131
  
    
AGENT_WCS_COMMAND = '/usr/sbin/wcsctl check-hobos'

  		




  132
  132
  
    
AGENT_AUTHENTIC_COMMAND = '/usr/bin/authentic2-ctl deploy'

  		




  133
  133
  
    

  		




  
  134
  
    
COMBO_SETTINGS_FILE = '/etc/combo/settings.py'

  		




  
  135
  
    
COMBO_MANAGE_COMMAND = '/usr/lib/combo/manage.py'

  		




  
  136
  
    

  		




  134
  137
  
    
try:

  		




  135
  138
  
    
    from kombu.common import Broadcast

  		




  136
  139
  
    
    CELERY_ACCEPT_CONTENT = ['json']

  		




  137
  
  
    
-