Merge lp:~seyeongkim/charms/trusty/swift-proxy/lp1334648.1 into lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next

[Seyeong Kim]

[Seyeong Kim (seyeongkim)]

re propose, because there was weird problem.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #3180 swift-proxy-next for xtrusia mp255614
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3180/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2968 swift-proxy-next for xtrusia mp255614
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2968/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2984 swift-proxy-next for xtrusia mp255614
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/10780014/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2984/

[lp:~seyeongkim/charms/trusty/swift-proxy/lp1334648.1]

91. By Seyeong Kim on 2015-04-09

remove comment

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #3181 swift-proxy-next for xtrusia mp255614
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3181/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2969 swift-proxy-next for xtrusia mp255614
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2969/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2985 swift-proxy-next for xtrusia mp255614
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/10780667/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2985/

[lp:~seyeongkim/charms/trusty/swift-proxy/lp1334648.1]

92. By Seyeong Kim on 2015-04-10

add tests

[Seyeong Kim (seyeongkim)]

not sure how i can fix the race condition problem on amulet test failed.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #3201 swift-proxy-next for xtrusia mp255614
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3201/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2989 swift-proxy-next for xtrusia mp255614
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2989/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #3018 swift-proxy-next for xtrusia mp255614
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/10789132/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3018/

[James Page (james-page)]

review: Needs Fixing

[Seyeong Kim (seyeongkim)]

please see inline question

[lp:~seyeongkim/charms/trusty/swift-proxy/lp1334648.1]

93. By Seyeong Kim on 2015-04-13

default things to template, more option on if branch

Unmerged revisions

=== modified file 'config.yaml'
--- config.yaml	2015-04-08 14:25:58 +0000
+++ config.yaml	2015-04-13 22:57:35 +0000
@@ -122,6 +122,18 @@
       Timeouts from these requests can be recovered from so setting this to
       something lower than node-timeout would provide quicker error recovery
       while allowing for a longer timeout for non-recoverable requests (PUTs).
+  # Logging configuration
+  debug:
+    default: False
+    type: boolean
+    description: |
+      Set log-name, log-facility, log-level, log-address
+  log-headers:
+    default: False
+    type: boolean
+    description: |
+      Enables the ability to log request headers.
+      The default is False.
   # Manual Keystone configuration.
   keystone-auth-host:
     type: string

=== modified file 'hooks/swift_context.py'
--- hooks/swift_context.py	2015-03-31 08:39:46 +0000
+++ hooks/swift_context.py	2015-04-13 22:57:35 +0000
@@ -100,8 +100,14 @@
             'delay_auth_decision': config('delay-auth-decision'),
             'node_timeout': config('node-timeout'),
             'recoverable_node_timeout': config('recoverable-node-timeout'),
+            'log_headers': config('log-headers')
         }
 
+        if config('debug'):
+            ctxt['log_level'] = 'DEBUG'
+        else:
+            ctxt['log_level'] = 'INFO'
+
         # Instead of duplicating code lets use charm-helpers to set signing_dir
         # TODO(hopem): refactor this context handler to use charm-helpers
         #              code.

=== modified file 'templates/icehouse/proxy-server.conf'
--- templates/icehouse/proxy-server.conf	2015-02-20 10:20:45 +0000
+++ templates/icehouse/proxy-server.conf	2015-04-13 22:57:35 +0000
@@ -3,6 +3,12 @@
 workers = {{ workers }}
 user = swift
 bind_ip = {{ bind_host }}
+log_name = swift
+log_facility = LOG_LOCAL0
+log_level = {{ log_level }}
+log_address = /dev/log
+log_headers = {{ log_headers }}
+
 {% if ssl %}
 cert_file = {{ ssl_cert }}
 key_file = {{ ssl_key }}
@@ -10,10 +16,10 @@
 
 {% if auth_type == 'keystone' %}
 [pipeline:main]
-pipeline = gatekeeper healthcheck cache swift3 s3token container_sync bulk tempurl slo dlo formpost authtoken keystoneauth staticweb container-quotas account-quotas proxy-server
+pipeline = gatekeeper healthcheck proxy-logging cache swift3 s3token container_sync bulk tempurl slo dlo formpost authtoken keystoneauth staticweb container-quotas account-quotas proxy-logging proxy-server
 {% else %}
 [pipeline:main]
-pipeline = gatekeeper healthcheck cache container_sync bulk tempurl slo dlo formpost tempauth staticweb container-quotas account-quotas proxy-server
+pipeline = gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl slo dlo formpost tempauth staticweb container-quotas account-quotas proxy-logging proxy-server
 {% endif %}
 
 [app:proxy-server]
@@ -40,6 +46,9 @@
 [filter:container-quotas]
 use = egg:swift#container_quotas
 
+[filter:proxy-logging]
+use = egg:swift#proxy_logging
+
 [filter:staticweb]
 use = egg:swift#staticweb
 

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-03-25 17:54:29 +0000
+++ tests/basic_deployment.py	2015-04-13 22:57:35 +0000
@@ -368,13 +368,19 @@
         expected = {
             'DEFAULT': {
                 'bind_port': '8070',
-                'user': 'swift'
+                'user': 'swift',
+                'log_name': 'swift',
+                'log_facility': 'LOG_LOCAL0',
+                'log_level': 'INFO',
+                'log_headers': 'False',
+                'log_address': '/dev/log'
             },
             'pipeline:main': {
-                'pipeline': 'gatekeeper healthcheck cache swift3 s3token '
-                            'container_sync bulk tempurl slo dlo formpost '
-                            'authtoken keystoneauth staticweb '
-                            'container-quotas account-quotas proxy-server'
+                'pipeline': 'gatekeeper healthcheck proxy-logging cache swift3 '
+                            's3token container_sync bulk tempurl slo dlo '
+                            'formpost authtoken keystoneauth staticweb '
+                            'container-quotas account-quotas proxy-logging '
+                            'proxy-server'
             },
             'app:proxy-server': {
                 'use': 'egg:swift#proxy',
@@ -395,6 +401,7 @@
             },
             'filter:account-quotas': {'use': 'egg:swift#account_quotas'},
             'filter:container-quotas': {'use': 'egg:swift#container_quotas'},
+            'filter:proxy-logging': {'use': 'egg:swift#proxy_logging'},
             'filter:staticweb': {'use': 'egg:swift#staticweb'},
             'filter:bulk': {'use': 'egg:swift#bulk'},
             'filter:slo': {'use': 'egg:swift#slo'},