Juju Charms Collection
swift-proxy package

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

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

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

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

charm_unit_test #1513 swift-proxy-next for xtrusia mp248471
    UNIT OK: passed

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

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

charm_lint_check #1558 swift-proxy-next for xtrusia mp248471
    LINT OK: passed

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

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

charm_amulet_test #1636 swift-proxy-next for xtrusia mp248471
    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/10045653/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1636/

lp:~seyeongkim/charms/trusty/swift-proxy/lp1362102 updated
82. By Seyeong Kim

fix amulet expected value int to str

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

charm_lint_check #1730 swift-proxy-next for xtrusia mp248471
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
  W: config.yaml: option os-public-network does not have the keys: default
  W: config.yaml: option keystone-admin-password does not have the keys: default

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

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

charm_unit_test #1558 swift-proxy-next for xtrusia mp248471
    UNIT OK: passed

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

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

charm_amulet_test #1661 swift-proxy-next for xtrusia mp248471
    AMULET OK: passed

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

lp:~seyeongkim/charms/trusty/swift-proxy/lp1362102 updated
83. By Seyeong Kim

fix lint warning in config.yaml

84. By Seyeong Kim

fix lint warning in config.yaml

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

charm_lint_check #1731 swift-proxy-next for xtrusia mp248471
    LINT OK: passed

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

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

charm_unit_test #1559 swift-proxy-next for xtrusia mp248471
    UNIT OK: passed

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

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

charm_amulet_test #1662 swift-proxy-next for xtrusia mp248471
    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/10069327/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1662/

lp:~seyeongkim/charms/trusty/swift-proxy/lp1362102 updated
85. By Seyeong Kim

timeout to 1800

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

charm_unit_test #1606 swift-proxy-next for xtrusia mp248471
    UNIT OK: passed

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

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

charm_lint_check #1778 swift-proxy-next for xtrusia mp248471
    LINT OK: passed

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

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

charm_amulet_test #1798 swift-proxy-next for xtrusia mp248471
    AMULET OK: passed

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

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

Thanks Seyeong, couple of points inline.

review: Needs Fixing
Revision history for this message
Seyeong Kim (seyeongkim) :
Revision history for this message
Edward Hope-Morley (hopem) wrote :

See inline

lp:~seyeongkim/charms/trusty/swift-proxy/lp1362102 updated
86. By Seyeong Kim

charmhelper sync

87. By Seyeong Kim

remove uncertain test factor

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

charm_unit_test #2020 swift-proxy-next for xtrusia mp248471
    UNIT OK: passed

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

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

charm_lint_check #2231 swift-proxy-next for xtrusia mp248471
    LINT OK: passed

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

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

charm_amulet_test #2177 swift-proxy-next for xtrusia mp248471
    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/10397312/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2177/

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2014-09-29 21:11:28 +0000
+++ Makefile 2015-02-24 12:50:52 +0000
@@ -15,7 +15,7 @@
15 # coreycb note: The -v should only be temporary until Amulet sends15 # coreycb note: The -v should only be temporary until Amulet sends
16 # raise_status() messages to stderr:16 # raise_status() messages to stderr:
17 # https://bugs.launchpad.net/amulet/+bug/132035717 # https://bugs.launchpad.net/amulet/+bug/1320357
18 @juju test -v -p AMULET_HTTP_PROXY --timeout 900 \18 @juju test -v -p AMULET_HTTP_PROXY --timeout 1800 \
19 00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse19 00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse
2020
21bin/charm_helpers_sync.py:21bin/charm_helpers_sync.py:
2222
=== modified file 'config.yaml'
--- config.yaml 2015-02-19 20:31:42 +0000
+++ config.yaml 2015-02-24 12:50:52 +0000
@@ -62,6 +62,7 @@
62 this charm's README for details.62 this charm's README for details.
63 # User provided SSL cert and key63 # User provided SSL cert and key
64 ssl_cert:64 ssl_cert:
65 default:
65 type: string66 type: string
66 default:67 default:
67 description: |68 description: |
@@ -75,6 +76,7 @@
75 any certficiate and key issued by Keystone (if it is configured to76 any certficiate and key issued by Keystone (if it is configured to
76 do so).77 do so).
77 ssl_key:78 ssl_key:
79 default:
78 type: string80 type: string
79 default:81 default:
80 description: |82 description: |
@@ -118,6 +120,7 @@
118 while allowing for a longer timeout for non-recoverable requests (PUTs).120 while allowing for a longer timeout for non-recoverable requests (PUTs).
119 # Manual Keystone configuration.121 # Manual Keystone configuration.
120 keystone-auth-host:122 keystone-auth-host:
123 default:
121 type: string124 type: string
122 default:125 default:
123 description: Keystone authentication host126 description: Keystone authentication host
@@ -134,19 +137,23 @@
134 type: string137 type: string
135 description: Keystone admin tenant name138 description: Keystone admin tenant name
136 keystone-admin-user:139 keystone-admin-user:
140 default:
137 type: string141 type: string
138 default:142 default:
139 description: Keystone admin username143 description: Keystone admin username
140 keystone-admin-password:144 keystone-admin-password:
145 default:
141 type: string146 type: string
142 default:147 default:
143 description: Keystone admin password148 description: Keystone admin password
144 # HA configuration settings149 # HA configuration settings
145 swift-hash:150 swift-hash:
151 default:
146 type: string152 type: string
147 default:153 default:
148 description: Hash to use across all swift-proxy servers - don't loose154 description: Hash to use across all swift-proxy servers - don't loose
149 vip:155 vip:
156 default:
150 type: string157 type: string
151 default:158 default:
152 description: |159 description: |
@@ -169,6 +176,7 @@
169 # Network configuration options176 # Network configuration options
170 # by default all access is over 'private-address'177 # by default all access is over 'private-address'
171 os-admin-network:178 os-admin-network:
179 default:
172 type: string180 type: string
173 default:181 default:
174 description: |182 description: |
@@ -177,6 +185,7 @@
177 .185 .
178 This network will be used for admin endpoints.186 This network will be used for admin endpoints.
179 os-internal-network:187 os-internal-network:
188 default:
180 type: string189 type: string
181 default:190 default:
182 description: |191 description: |
@@ -185,6 +194,7 @@
185 .194 .
186 This network will be used for internal endpoints.195 This network will be used for internal endpoints.
187 os-public-network:196 os-public-network:
197 default:
188 type: string198 type: string
189 default:199 default:
190 description: |200 description: |
191201
=== modified file 'hooks/swift_context.py'
--- hooks/swift_context.py 2014-12-19 10:29:32 +0000
+++ hooks/swift_context.py 2015-02-24 12:50:52 +0000
@@ -80,7 +80,7 @@
80 def __call__(self):80 def __call__(self):
81 bind_port = config('bind-port')81 bind_port = config('bind-port')
82 workers = config('workers')82 workers = config('workers')
83 if workers == '0':83 if workers == 0:
84 import multiprocessing84 import multiprocessing
85 workers = multiprocessing.cpu_count()85 workers = multiprocessing.cpu_count()
86 if config('prefer-ipv6'):86 if config('prefer-ipv6'):
8787
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py 2015-01-05 13:43:32 +0000
+++ tests/basic_deployment.py 2015-02-24 12:50:52 +0000
@@ -369,7 +369,6 @@
369 expected = {369 expected = {
370 'DEFAULT': {370 'DEFAULT': {
371 'bind_port': '8070',371 'bind_port': '8070',
372 'workers': '0',
373 'user': 'swift'372 'user': 'swift'
374 },373 },
375 'pipeline:main': {374 'pipeline:main': {
@@ -462,7 +461,6 @@
462 expected = {461 expected = {
463 'DEFAULT': {462 'DEFAULT': {
464 'bind_port': '8070',463 'bind_port': '8070',
465 'workers': '0',
466 'user': 'swift'464 'user': 'swift'
467 },465 },
468 'pipeline:main': {466 'pipeline:main': {
@@ -547,7 +545,6 @@
547 expected = {545 expected = {
548 'DEFAULT': {546 'DEFAULT': {
549 'bind_port': '8070',547 'bind_port': '8070',
550 'workers': '0',
551 'user': 'swift'548 'user': 'swift'
552 },549 },
553 'pipeline:main': {550 'pipeline:main': {
@@ -632,7 +629,6 @@
632 expected = {629 expected = {
633 'DEFAULT': {630 'DEFAULT': {
634 'bind_port': '8070',631 'bind_port': '8070',
635 'workers': '0',
636 'user': 'swift'632 'user': 'swift'
637 },633 },
638 'pipeline:main': {634 'pipeline:main': {
@@ -713,7 +709,6 @@
713 expected = {709 expected = {
714 'DEFAULT': {710 'DEFAULT': {
715 'bind_port': '8070',711 'bind_port': '8070',
716 'workers': '0',
717 'user': 'swift'712 'user': 'swift'
718 },713 },
719 'pipeline:main': {714 'pipeline:main': {

Subscribers

People subscribed via source and target branches