From 040aa5dee38f6cbf57032d429a3f804bce88ba0a Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Fri, 16 Jan 2015 15:32:31 +0000
Subject: [PATCH] r104 is broken - reverting to r103

---
 hooks/keystone_context.py            | 11 -----
 hooks/keystone_utils.py              |  5 --
 templates/icehouse/logging.conf      | 69 ----------------------------
 unit_tests/test_keystone_contexts.py | 10 ----
 4 files changed, 95 deletions(-)
 delete mode 100644 templates/icehouse/logging.conf

diff --git a/hooks/keystone_context.py b/hooks/keystone_context.py
index 83653712..8d0d40cd 100644
--- a/hooks/keystone_context.py
+++ b/hooks/keystone_context.py
@@ -134,14 +134,3 @@ class KeystoneContext(context.OSContextGenerator):
             resolve_address(ADMIN),
             api_port('keystone-admin')).rstrip('v2.0')
         return ctxt
-
-
-class KeystoneLoggingContext(context.OSContextGenerator):
-
-    def __call__(self):
-        ctxt = {}
-        debug = config('debug')
-        if debug and debug.lower() in ['yes', 'true']:
-            ctxt['root_level'] = 'DEBUG'
-
-        return ctxt
diff --git a/hooks/keystone_utils.py b/hooks/keystone_utils.py
index fda9f4f1..58123c3e 100644
--- a/hooks/keystone_utils.py
+++ b/hooks/keystone_utils.py
@@ -100,7 +100,6 @@ API_PORTS = {
 }
 
 KEYSTONE_CONF = "/etc/keystone/keystone.conf"
-KEYSTONE_LOGGER_CONF = "/etc/keystone/logging.conf"
 KEYSTONE_CONF_DIR = os.path.dirname(KEYSTONE_CONF)
 STORED_PASSWD = "/var/lib/keystone/keystone.passwd"
 STORED_TOKEN = "/var/lib/keystone/keystone.token"
@@ -126,10 +125,6 @@ BASE_RESOURCE_MAP = OrderedDict([
                      context.BindHostContext(),
                      context.WorkerConfigContext()],
     }),
-    (KEYSTONE_LOGGER_CONF, {
-        'contexts': [keystone_context.KeystoneLoggingContext()],
-        'services': BASE_SERVICES,
-    }),
     (HAPROXY_CONF, {
         'contexts': [context.HAProxyContext(singlenode_mode=True),
                      keystone_context.HAProxyContext()],
diff --git a/templates/icehouse/logging.conf b/templates/icehouse/logging.conf
deleted file mode 100644
index 7ccbf598..00000000
--- a/templates/icehouse/logging.conf
+++ /dev/null
@@ -1,69 +0,0 @@
-[loggers]
-keys=root,access
-
-[handlers]
-keys=production,file,access_file,devel
-
-[formatters]
-keys=minimal,normal,debug
-
-
-###########
-# Loggers #
-###########
-
-[logger_root]
-{% if root_level -%}
-level={{ root_level }}
-{% else -%}
-level=WARNING
-{% endif -%}
-handlers=file
-
-[logger_access]
-level=INFO
-qualname=access
-handlers=access_file
-
-
-################
-# Log Handlers #
-################
-
-[handler_production]
-class=handlers.SysLogHandler
-level=ERROR
-formatter=normal
-args=(('localhost', handlers.SYSLOG_UDP_PORT), handlers.SysLogHandler.LOG_USER)
-
-[handler_file]
-class=handlers.WatchedFileHandler
-level=WARNING
-formatter=normal
-args=('error.log',)
-
-[handler_access_file]
-class=handlers.WatchedFileHandler
-level=INFO
-formatter=minimal
-args=('access.log',)
-
-[handler_devel]
-class=StreamHandler
-level=NOTSET
-formatter=debug
-args=(sys.stdout,)
-
-
-##################
-# Log Formatters #
-##################
-
-[formatter_minimal]
-format=%(message)s
-
-[formatter_normal]
-format=(%(name)s): %(asctime)s %(levelname)s %(message)s
-
-[formatter_debug]
-format=(%(name)s): %(asctime)s %(levelname)s %(module)s %(funcName)s %(message)s
diff --git a/unit_tests/test_keystone_contexts.py b/unit_tests/test_keystone_contexts.py
index a10426f4..70b44b34 100644
--- a/unit_tests/test_keystone_contexts.py
+++ b/unit_tests/test_keystone_contexts.py
@@ -119,13 +119,3 @@ class TestKeystoneContexts(CharmTestCase):
         msg = "Multiple networks configured but net_type" \
               " is None (os-public-network)."
         mock_log.assert_called_with(msg, level="WARNING")
-
-    @patch.object(context, 'config')
-    def test_keystone_logger_context(self, mock_config):
-        ctxt = context.KeystoneLoggingContext()
-
-        mock_config.return_value = None
-        self.assertEqual({}, ctxt())
-
-        mock_config.return_value = 'True'
-        self.assertEqual({'root_level': 'DEBUG'}, ctxt())