Juju Charms Collection
swift-proxy package

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

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

This proposal has been superseded by a proposal from 2015-02-10.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

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

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/

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

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/

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

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/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

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

review: Needs Fixing
lp:~seyeongkim/charms/trusty/swift-proxy/lp1334648 updated
83. By Seyeong Kim

edit some conf order

84. By Seyeong Kim

reduce timeout to default

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

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/

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

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/

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

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

modify amulet config test

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

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/

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

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/

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

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

fix amulet test

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

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/

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

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/

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

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/

Revision history for this message
Edward Hope-Morley (hopem) wrote :

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.

Revision history for this message
Edward Hope-Morley (hopem) wrote :

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

fix some issues

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

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/

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

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/

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

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

remove amulet test < icehouse part

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

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/

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

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/

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

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

charmhelpers sync

90. By Seyeong Kim

combine 4 configurations to debug

91. By Seyeong Kim

fix conflicts

92. By Seyeong Kim

fix debug type

93. By Seyeong Kim

fix mistake on basic_deployment.py

94. By Seyeong Kim

amulet test

95. By Seyeong Kim

fix config.yaml

96. By Seyeong Kim

test

97. By Seyeong Kim

fix some amulet test

98. By Seyeong Kim

fix some amulet test

99. By Seyeong Kim

default things to template, more option on if branch

100. By Seyeong Kim

remove test timeout

Unmerged revisions

100. By Seyeong Kim

remove test timeout

99. By Seyeong Kim

default things to template, more option on if branch

98. By Seyeong Kim

fix some amulet test

97. By Seyeong Kim

fix some amulet test

96. By Seyeong Kim

test

95. By Seyeong Kim

fix config.yaml

94. By Seyeong Kim

amulet test

93. By Seyeong Kim

fix mistake on basic_deployment.py

92. By Seyeong Kim

fix debug type

91. By Seyeong Kim

fix conflicts

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
114 Timeouts from these requests can be recovered from so setting this to114 Timeouts from these requests can be recovered from so setting this to
115 something lower than node-timeout would provide quicker error recovery115 something lower than node-timeout would provide quicker error recovery
116 while allowing for a longer timeout for non-recoverable requests (PUTs).116 while allowing for a longer timeout for non-recoverable requests (PUTs).
117 # Logging configuration
118 log-name:
119 default: swift
120 type: string
121 description: Label used when logging. The default is swift.
122 log-facility:
123 default: LOG_LOCAL0
124 type: string
125 description: Syslog log facility. The default is LOG_LOCAL0.
126 log-level:
127 default: INFO
128 type: string
129 description: Logging level. The default is INFO.
130 log-headers:
131 default: false
132 type: boolean
133 description: |
134 Enables the ability to log request headers.
135 The default is False.
136 log-address:
137 default: /dev/log
138 type: string
139 description: Logging address. The default is /dev/log.
117 # Manual Keystone configuration.140 # Manual Keystone configuration.
118 keystone-auth-host:141 keystone-auth-host:
119 type: string142 type: string
120143
=== 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 @@
99 'delay_auth_decision': config('delay-auth-decision'),99 'delay_auth_decision': config('delay-auth-decision'),
100 'node_timeout': config('node-timeout'),100 'node_timeout': config('node-timeout'),
101 'recoverable_node_timeout': config('recoverable-node-timeout'),101 'recoverable_node_timeout': config('recoverable-node-timeout'),
102 'log_name': config('log-name'),
103 'log_facility': config('log-facility'),
104 'log_level': config('log-level'),
105 'log_headers': config('log-headers'),
106 'log_address': config('log-address')
102 }107 }
103108
104 ctxt['ssl'] = False109 ctxt['ssl'] = False
105110
=== 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 @@
3workers = {{ workers }}3workers = {{ workers }}
4user = swift4user = swift
5bind_ip = {{ bind_host }}5bind_ip = {{ bind_host }}
6log_name = {{ log_name }}
7log_facility = {{ log_facility }}
8log_level = {{ log_level }}
9log_headers = {{ log_headers }}
10log_address = {{ log_address }}
6{% if ssl %}11{% if ssl %}
7cert_file = {{ ssl_cert }}12cert_file = {{ ssl_cert }}
8key_file = {{ ssl_key }}13key_file = {{ ssl_key }}
@@ -10,10 +15,10 @@
1015
11{% if auth_type == 'keystone' %}16{% if auth_type == 'keystone' %}
12[pipeline:main]17[pipeline:main]
13pipeline = gatekeeper healthcheck cache swift3 s3token container_sync bulk tempurl slo dlo formpost authtoken keystoneauth staticweb container-quotas account-quotas proxy-server18pipeline = 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 %}19{% else %}
15[pipeline:main]20[pipeline:main]
16pipeline = gatekeeper healthcheck cache container_sync bulk tempurl slo dlo formpost tempauth staticweb container-quotas account-quotas proxy-server21pipeline = gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl slo dlo formpost tempauth staticweb container-quotas account-quotas proxy-logging proxy-server
17{% endif %}22{% endif %}
1823
19[app:proxy-server]24[app:proxy-server]
@@ -40,6 +45,9 @@
40[filter:container-quotas]45[filter:container-quotas]
41use = egg:swift#container_quotas46use = egg:swift#container_quotas
4247
48[filter:proxy-logging]
49use = egg:swift#proxy_logging
50
43[filter:staticweb]51[filter:staticweb]
44use = egg:swift#staticweb52use = egg:swift#staticweb
4553
4654
=== 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 @@
370 'DEFAULT': {370 'DEFAULT': {
371 'bind_port': '8070',371 'bind_port': '8070',
372 'workers': '0',372 'workers': '0',
373 'user': 'swift'373 'user': 'swift',
374 'log_name': 'swift',
375 'log_facility': 'LOG_LOCAL0',
376 'log_level': 'INFO',
377 'log_headers': 'False',
378 'log_address': '/dev/log'
374 },379 },
375 'pipeline:main': {380 'pipeline:main': {
376 'pipeline': 'gatekeeper healthcheck cache swift3 s3token '381 'pipeline': 'gatekeeper healthcheck proxy-logging cache swift3 '
377 'container_sync bulk tempurl slo dlo formpost '382 's3token container_sync bulk tempurl slo dlo '
378 'authtoken keystoneauth staticweb '383 'formpost authtoken keystoneauth staticweb '
379 'container-quotas account-quotas proxy-server'384 'container-quotas account-quotas proxy-logging '
385 'proxy-server'
380 },386 },
381 'app:proxy-server': {387 'app:proxy-server': {
382 'use': 'egg:swift#proxy',388 'use': 'egg:swift#proxy',
@@ -397,6 +403,7 @@
397 },403 },
398 'filter:account-quotas': {'use': 'egg:swift#account_quotas'},404 'filter:account-quotas': {'use': 'egg:swift#account_quotas'},
399 'filter:container-quotas': {'use': 'egg:swift#container_quotas'},405 'filter:container-quotas': {'use': 'egg:swift#container_quotas'},
406 'filter:proxy-logging': {'use': 'egg:swift#proxy_logging'},
400 'filter:staticweb': {'use': 'egg:swift#staticweb'},407 'filter:staticweb': {'use': 'egg:swift#staticweb'},
401 'filter:bulk': {'use': 'egg:swift#bulk'},408 'filter:bulk': {'use': 'egg:swift#bulk'},
402 'filter:slo': {'use': 'egg:swift#slo'},409 'filter:slo': {'use': 'egg:swift#slo'},

Subscribers

People subscribed via source and target branches