From 70a39a2c0a9d5c4e1e8cb06bb6be7a1a5b5238a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Tue, 10 Feb 2015 11:23:52 +0100
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(+)

diff --git a/hobo/agent/services.py b/hobo/agent/services.py
index 896a63b..8dc3147 100644
--- a/hobo/agent/services.py
+++ b/hobo/agent/services.py
@@ -89,6 +89,14 @@ class Authentic(BaseService):
                 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
         stdout = cmd_process.communicate(input=json.dumps(environment))
 
+
+class Combo(BaseService):
+    service_id = 'combo'
+    service_settings_env = 'COMBO_SETTINGS_FILE'
+    service_manage_cmd = settings.COMBO_MANAGE_COMMAND
+    service_settings_file = settings.COMBO_SETTINGS_FILE
+
+
 def deploy(environment):
     hobo_timestamp = environment.get('timestamp')
 
diff --git a/hobo/settings.py b/hobo/settings.py
index 084972e..353383e 100644
--- a/hobo/settings.py
+++ b/hobo/settings.py
@@ -131,6 +131,9 @@ AGENT_HOST_PATTERNS = None
 AGENT_WCS_COMMAND = '/usr/sbin/wcsctl check-hobos'
 AGENT_AUTHENTIC_COMMAND = '/usr/bin/authentic2-ctl deploy'
 
+COMBO_SETTINGS_FILE = '/etc/combo/settings.py'
+COMBO_MANAGE_COMMAND = '/usr/lib/combo/manage.py'
+
 try:
     from kombu.common import Broadcast
     CELERY_ACCEPT_CONTENT = ['json']
-- 
2.1.4