Projet

Général

Profil

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

Frédéric Péters, 10 février 2015 14:23

Télécharger (1,29 ko)

Voir les différences: 

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


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

  		




  
  91
  
    

  		




  
  92
  
    
class Combo(BaseService):

  		




  
  93
  
    
    service_id = 'combo'

  		




  
  94
  
    
    service_manage_cmd = settings.COMBO_MANAGE_COMMAND

  		




  
  95
  
    

  		




  
  96
  
    

  		




  91
  97
  
    
def deploy(environment):

  		




  92
  98
  
    
    hobo_timestamp = environment.get('timestamp')

  		




  93
  99
  
    

  		












  

    
      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_MANAGE_COMMAND = '/usr/lib/combo/manage.py'

  		




  
  135
  
    

  		




  134
  136
  
    
try:

  		




  135
  137
  
    
    from kombu.common import Broadcast

  		




  136
  138
  
    
    CELERY_ACCEPT_CONTENT = ['json']

  		




  137
  
  
    
-