Juju Charms Collection
swift-proxy package

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

  1. Trusty Tahr (14.04)
  2. lp1334648.1
  3. Merge into next
Proposed by Seyeong Kim
Status: Superseded
Proposed branch: lp:~seyeongkim/charms/trusty/swift-proxy/lp1334648.1
Merge into: lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next
Diff against target: 118 lines (+41/-7)
4 files modified
config.yaml (+12/-0)
hooks/swift_context.py (+6/-0)
templates/icehouse/proxy-server.conf (+11/-2)
tests/basic_deployment.py (+12/-5)
To merge this branch: bzr merge lp:~seyeongkim/charms/trusty/swift-proxy/lp1334648.1
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Edward Hope-Morley Pending
Review via email: mp+255614@code.launchpad.net

This proposal has been superseded by a proposal from 2015-04-13.

To post a comment you must log in.
Revision history for this message
Seyeong Kim (seyeongkim) wrote :

re propose, because there was weird problem.

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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 updated
91. By Seyeong Kim

remove comment

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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 updated
92. By Seyeong Kim

add tests

Revision history for this message
Seyeong Kim (seyeongkim) wrote :

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
James Page (james-page) :
review: Needs Fixing
Revision history for this message
Seyeong Kim (seyeongkim) wrote :

please see inline question

Revision history for this message
Billy Olsen (billy-olsen) :
lp:~seyeongkim/charms/trusty/swift-proxy/lp1334648.1 updated
93. By Seyeong Kim

default things to template, more option on if branch

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
122 Timeouts from these requests can be recovered from so setting this to122 Timeouts from these requests can be recovered from so setting this to
123 something lower than node-timeout would provide quicker error recovery123 something lower than node-timeout would provide quicker error recovery
124 while allowing for a longer timeout for non-recoverable requests (PUTs).124 while allowing for a longer timeout for non-recoverable requests (PUTs).
125 # Logging configuration
126 debug:
127 default: False
128 type: boolean
129 description: |
130 Set log-name, log-facility, log-level, log-address
131 log-headers:
132 default: False
133 type: boolean
134 description: |
135 Enables the ability to log request headers.
136 The default is False.
125 # Manual Keystone configuration.137 # Manual Keystone configuration.
126 keystone-auth-host:138 keystone-auth-host:
127 type: string139 type: string
128140
=== 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 @@
100 'delay_auth_decision': config('delay-auth-decision'),100 'delay_auth_decision': config('delay-auth-decision'),
101 'node_timeout': config('node-timeout'),101 'node_timeout': config('node-timeout'),
102 'recoverable_node_timeout': config('recoverable-node-timeout'),102 'recoverable_node_timeout': config('recoverable-node-timeout'),
103 'log_headers': config('log-headers')
103 }104 }
104105
106 if config('debug'):
107 ctxt['log_level'] = 'DEBUG'
108 else:
109 ctxt['log_level'] = 'INFO'
110
105 # Instead of duplicating code lets use charm-helpers to set signing_dir111 # Instead of duplicating code lets use charm-helpers to set signing_dir
106 # TODO(hopem): refactor this context handler to use charm-helpers112 # TODO(hopem): refactor this context handler to use charm-helpers
107 # code.113 # code.
108114
=== 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 @@
3workers = {{ workers }}3workers = {{ workers }}
4user = swift4user = swift
5bind_ip = {{ bind_host }}5bind_ip = {{ bind_host }}
6log_name = swift
7log_facility = LOG_LOCAL0
8log_level = {{ log_level }}
9log_address = /dev/log
10log_headers = {{ log_headers }}
11
6{% if ssl %}12{% if ssl %}
7cert_file = {{ ssl_cert }}13cert_file = {{ ssl_cert }}
8key_file = {{ ssl_key }}14key_file = {{ ssl_key }}
@@ -10,10 +16,10 @@
1016
11{% if auth_type == 'keystone' %}17{% if auth_type == 'keystone' %}
12[pipeline:main]18[pipeline:main]
13pipeline = gatekeeper healthcheck cache swift3 s3token container_sync bulk tempurl slo dlo formpost authtoken keystoneauth staticweb container-quotas account-quotas proxy-server19pipeline = 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
14{% else %}20{% else %}
15[pipeline:main]21[pipeline:main]
16pipeline = gatekeeper healthcheck cache container_sync bulk tempurl slo dlo formpost tempauth staticweb container-quotas account-quotas proxy-server22pipeline = gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl slo dlo formpost tempauth staticweb container-quotas account-quotas proxy-logging proxy-server
17{% endif %}23{% endif %}
1824
19[app:proxy-server]25[app:proxy-server]
@@ -40,6 +46,9 @@
40[filter:container-quotas]46[filter:container-quotas]
41use = egg:swift#container_quotas47use = egg:swift#container_quotas
4248
49[filter:proxy-logging]
50use = egg:swift#proxy_logging
51
43[filter:staticweb]52[filter:staticweb]
44use = egg:swift#staticweb53use = egg:swift#staticweb
4554
4655
=== 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 @@
368 expected = {368 expected = {
369 'DEFAULT': {369 'DEFAULT': {
370 'bind_port': '8070',370 'bind_port': '8070',
371 'user': 'swift'371 'user': 'swift',
372 'log_name': 'swift',
373 'log_facility': 'LOG_LOCAL0',
374 'log_level': 'INFO',
375 'log_headers': 'False',
376 'log_address': '/dev/log'
372 },377 },
373 'pipeline:main': {378 'pipeline:main': {
374 'pipeline': 'gatekeeper healthcheck cache swift3 s3token '379 'pipeline': 'gatekeeper healthcheck proxy-logging cache swift3 '
375 'container_sync bulk tempurl slo dlo formpost '380 's3token container_sync bulk tempurl slo dlo '
376 'authtoken keystoneauth staticweb '381 'formpost authtoken keystoneauth staticweb '
377 'container-quotas account-quotas proxy-server'382 'container-quotas account-quotas proxy-logging '
383 'proxy-server'
378 },384 },
379 'app:proxy-server': {385 'app:proxy-server': {
380 'use': 'egg:swift#proxy',386 'use': 'egg:swift#proxy',
@@ -395,6 +401,7 @@
395 },401 },
396 'filter:account-quotas': {'use': 'egg:swift#account_quotas'},402 'filter:account-quotas': {'use': 'egg:swift#account_quotas'},
397 'filter:container-quotas': {'use': 'egg:swift#container_quotas'},403 'filter:container-quotas': {'use': 'egg:swift#container_quotas'},
404 'filter:proxy-logging': {'use': 'egg:swift#proxy_logging'},
398 'filter:staticweb': {'use': 'egg:swift#staticweb'},405 'filter:staticweb': {'use': 'egg:swift#staticweb'},
399 'filter:bulk': {'use': 'egg:swift#bulk'},406 'filter:bulk': {'use': 'egg:swift#bulk'},
400 'filter:slo': {'use': 'egg:swift#slo'},407 'filter:slo': {'use': 'egg:swift#slo'},

Subscribers

People subscribed via source and target branches