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

[Seyeong Kim]

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

charm_lint_check #1297 swift-proxy-next for xtrusia mp247835
    LINT OK: passed

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

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

charm_unit_test #1250 swift-proxy-next for xtrusia mp247835
    UNIT OK: passed

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

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

charm_amulet_test #1351 swift-proxy-next for xtrusia mp247835
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

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

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

charm_amulet_test #1352 swift-proxy-next for xtrusia mp247835
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

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

[Ryan Beisner (1chb1n)]

FYI I triggered another run of the amulet test to confirm failure.

review: Needs Fixing

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

83. By Seyeong Kim on 2015-01-30

edit some conf order

84. By Seyeong Kim on 2015-01-30

reduce timeout to default

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

charm_unit_test #1408 swift-proxy-next for xtrusia mp247835
    UNIT OK: passed

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

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

charm_lint_check #1455 swift-proxy-next for xtrusia mp247835
    LINT OK: passed

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

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

charm_amulet_test #1573 swift-proxy-next for xtrusia mp247835
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

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

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

85. By Seyeong Kim on 2015-01-31

modify amulet config test

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

charm_lint_check #1457 swift-proxy-next for xtrusia mp247835
    LINT OK: passed

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

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

charm_unit_test #1410 swift-proxy-next for xtrusia mp247835
    UNIT OK: passed

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

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

charm_amulet_test #1575 swift-proxy-next for xtrusia mp247835
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

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

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

86. By Seyeong Kim on 2015-01-31

fix amulet test

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

charm_lint_check #1458 swift-proxy-next for xtrusia mp247835
    LINT OK: passed

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

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

charm_unit_test #1411 swift-proxy-next for xtrusia mp247835
    UNIT OK: passed

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

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

charm_amulet_test #1576 swift-proxy-next for xtrusia mp247835
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/1576/

[Edward Hope-Morley (hopem)]

Seyeong thanks a lot for adding this in it is very much needed indeed. I would like to deploy it before giving a +1 and will endeavour to do so asap. Thanks.

[Edward Hope-Morley (hopem)]

Ok finally tested this out and it seems to work well. There a few things that should be cleaned up though (see inline).

review: Needs Fixing

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

87. By Seyeong Kim on 2015-02-09

fix some issues

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

charm_lint_check #1825 swift-proxy-next for xtrusia mp247835
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
  W: config.yaml: option keystone-admin-password does not have the keys: default
  make: *** [lint] Error 100

Full lint test output: http://paste.ubuntu.com/10135958/
Build: http://10.245.162.77:8080/job/charm_lint_check/1825/

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

charm_unit_test #1653 swift-proxy-next for xtrusia mp247835
    UNIT OK: passed

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

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

charm_amulet_test #1844 swift-proxy-next for xtrusia mp247835
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/1844/

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

88. By Seyeong Kim on 2015-02-10

remove amulet test < icehouse part

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

charm_unit_test #1660 swift-proxy-next for xtrusia mp247835
    UNIT OK: passed

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

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

charm_lint_check #1832 swift-proxy-next for xtrusia mp247835
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
  W: config.yaml: option keystone-admin-password does not have the keys: default
  make: *** [lint] Error 100

Full lint test output: http://paste.ubuntu.com/10156942/
Build: http://10.245.162.77:8080/job/charm_lint_check/1832/

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

charm_amulet_test #1851 swift-proxy-next for xtrusia mp247835
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/1851/

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

89. By Seyeong Kim on 2015-02-25

charmhelpers sync

90. By Seyeong Kim on 2015-04-07

combine 4 configurations to debug

91. By Seyeong Kim on 2015-04-07

fix conflicts

92. By Seyeong Kim on 2015-04-07

fix debug type

93. By Seyeong Kim on 2015-04-07

fix mistake on basic_deployment.py

94. By Seyeong Kim on 2015-04-08

amulet test

95. By Seyeong Kim on 2015-04-08

fix config.yaml

96. By Seyeong Kim on 2015-04-09

test

97. By Seyeong Kim on 2015-04-09

fix some amulet test

98. By Seyeong Kim on 2015-04-09

fix some amulet test

99. By Seyeong Kim on 2015-04-13

default things to template, more option on if branch

100. By Seyeong Kim on 2015-04-13

remove test timeout

Unmerged revisions

100. By Seyeong Kim on 2015-04-13

remove test timeout

99. By Seyeong Kim on 2015-04-13

default things to template, more option on if branch

98. By Seyeong Kim on 2015-04-09

fix some amulet test

97. By Seyeong Kim on 2015-04-09

fix some amulet test

96. By Seyeong Kim on 2015-04-09

test

95. By Seyeong Kim on 2015-04-08

fix config.yaml

94. By Seyeong Kim on 2015-04-08

amulet test

93. By Seyeong Kim on 2015-04-07

fix mistake on basic_deployment.py

92. By Seyeong Kim on 2015-04-07

fix debug type

91. By Seyeong Kim on 2015-04-07

fix conflicts

=== modified file 'config.yaml'
--- config.yaml	2015-01-09 10:36:01 +0000
+++ config.yaml	2015-02-10 10:45:35 +0000
@@ -114,6 +114,29 @@
       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
+  log-name:
+    default: swift
+    type: string
+    description: Label used when logging. The default is swift.
+  log-facility:
+    default: LOG_LOCAL0
+    type: string
+    description: Syslog log facility. The default is LOG_LOCAL0.
+  log-level:
+    default: INFO
+    type: string
+    description: Logging level. The default is INFO.
+  log-headers:
+    default: false
+    type: boolean
+    description: |
+      Enables  the  ability  to log request headers. 
+      The default is False.
+  log-address:
+    default: /dev/log
+    type: string
+    description: Logging address. The default is /dev/log.
   # Manual Keystone configuration.
   keystone-auth-host:
     type: string

=== modified file 'hooks/swift_context.py'
--- hooks/swift_context.py	2014-12-19 10:29:32 +0000
+++ hooks/swift_context.py	2015-02-10 10:45:35 +0000
@@ -99,6 +99,11 @@
             'delay_auth_decision': config('delay-auth-decision'),
             'node_timeout': config('node-timeout'),
             'recoverable_node_timeout': config('recoverable-node-timeout'),
+            'log_name': config('log-name'),
+            'log_facility': config('log-facility'),
+            'log_level': config('log-level'),
+            'log_headers': config('log-headers'),
+            'log_address': config('log-address')
         }
 
         ctxt['ssl'] = False

=== modified file 'templates/icehouse/proxy-server.conf'
--- templates/icehouse/proxy-server.conf	2014-09-25 06:20:53 +0000
+++ templates/icehouse/proxy-server.conf	2015-02-10 10:45:35 +0000
@@ -3,6 +3,11 @@
 workers = {{ workers }}
 user = swift
 bind_ip = {{ bind_host }}
+log_name = {{ log_name }}
+log_facility = {{ log_facility }}
+log_level = {{ log_level }}
+log_headers = {{ log_headers }}
+log_address = {{ log_address }}
 {% if ssl %}
 cert_file = {{ ssl_cert }}
 key_file = {{ ssl_key }}
@@ -10,10 +15,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 +45,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-01-05 13:43:32 +0000
+++ tests/basic_deployment.py	2015-02-10 10:45:35 +0000
@@ -370,13 +370,19 @@
             'DEFAULT': {
                 'bind_port': '8070',
                 'workers': '0',
-                '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',
@@ -397,6 +403,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'},