From 9c0c158cbcdcf12f75ebb97941b14f0e329043b5 Mon Sep 17 00:00:00 2001
From: Gary Kotton <gkotton@redhat.com>
Date: Sun, 3 Mar 2013 13:39:12 +0000
Subject: [PATCH] Enable HA proxy to work with fedora

Fixes bug 1142133

Change-Id: I0dc02c96efa8d5f8ab693480e510dbbefcc6a674
---
 etc/lbaas_agent.ini                                        | 3 +++
 .../plugins/services/agent_loadbalancer/agent/manager.py   | 7 ++++++-
 .../services/agent_loadbalancer/drivers/haproxy/cfg.py     | 4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/etc/lbaas_agent.ini b/etc/lbaas_agent.ini
index e3ea75c3d..2242cdc45 100644
--- a/etc/lbaas_agent.ini
+++ b/etc/lbaas_agent.ini
@@ -22,3 +22,6 @@ device_driver = quantum.plugins.services.agent_loadbalancer.drivers.haproxy.name
 # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and
 # iproute2 package that supports namespaces).
 # use_namespaces = True
+
+# The user group
+# user_group = nogroup
diff --git a/quantum/plugins/services/agent_loadbalancer/agent/manager.py b/quantum/plugins/services/agent_loadbalancer/agent/manager.py
index 9dd2a70d3..f8c002c84 100644
--- a/quantum/plugins/services/agent_loadbalancer/agent/manager.py
+++ b/quantum/plugins/services/agent_loadbalancer/agent/manager.py
@@ -44,7 +44,12 @@ OPTS = [
     cfg.StrOpt(
         'interface_driver',
         help=_('The driver used to manage the virtual interface')
-    )
+    ),
+    cfg.StrOpt(
+        'user_group',
+        default='nogroup',
+        help=_('The user group'),
+    ),
 ]
 
 
diff --git a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/cfg.py b/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/cfg.py
index 9ea59756e..6f22a4d4e 100644
--- a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/cfg.py
+++ b/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/cfg.py
@@ -18,6 +18,8 @@
 
 import itertools
 
+from oslo.config import cfg
+
 from quantum.agent.linux import utils
 from quantum.plugins.common import constants as qconstants
 from quantum.plugins.services.agent_loadbalancer import constants
@@ -64,7 +66,7 @@ def _build_global(config, socket_path=None):
     opts = [
         'daemon',
         'user nobody',
-        'group nogroup',
+        'group %s' % cfg.CONF.user_group,
         'log /dev/log local0',
         'log /dev/log local1 notice'
     ]
-- 
2.45.2