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
1=== modified file 'Makefile'
2--- Makefile 2014-09-29 21:11:28 +0000
3+++ Makefile 2015-02-24 12:50:52 +0000
4@@ -15,7 +15,7 @@
5 # coreycb note: The -v should only be temporary until Amulet sends
6 # raise_status() messages to stderr:
7 # https://bugs.launchpad.net/amulet/+bug/1320357
8- @juju test -v -p AMULET_HTTP_PROXY --timeout 900 \
9+ @juju test -v -p AMULET_HTTP_PROXY --timeout 1800 \
10 00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse
11
12 bin/charm_helpers_sync.py:
13
14=== modified file 'config.yaml'
15--- config.yaml 2015-02-19 20:31:42 +0000
16+++ config.yaml 2015-02-24 12:50:52 +0000
17@@ -62,6 +62,7 @@
18 this charm's README for details.
19 # User provided SSL cert and key
20 ssl_cert:
21+ default:
22 type: string
23 default:
24 description: |
25@@ -75,6 +76,7 @@
26 any certficiate and key issued by Keystone (if it is configured to
27 do so).
28 ssl_key:
29+ default:
30 type: string
31 default:
32 description: |
33@@ -118,6 +120,7 @@
34 while allowing for a longer timeout for non-recoverable requests (PUTs).
35 # Manual Keystone configuration.
36 keystone-auth-host:
37+ default:
38 type: string
39 default:
40 description: Keystone authentication host
41@@ -134,19 +137,23 @@
42 type: string
43 description: Keystone admin tenant name
44 keystone-admin-user:
45+ default:
46 type: string
47 default:
48 description: Keystone admin username
49 keystone-admin-password:
50+ default:
51 type: string
52 default:
53 description: Keystone admin password
54 # HA configuration settings
55 swift-hash:
56+ default:
57 type: string
58 default:
59 description: Hash to use across all swift-proxy servers - don't loose
60 vip:
61+ default:
62 type: string
63 default:
64 description: |
65@@ -169,6 +176,7 @@
66 # Network configuration options
67 # by default all access is over 'private-address'
68 os-admin-network:
69+ default:
70 type: string
71 default:
72 description: |
73@@ -177,6 +185,7 @@
74 .
75 This network will be used for admin endpoints.
76 os-internal-network:
77+ default:
78 type: string
79 default:
80 description: |
81@@ -185,6 +194,7 @@
82 .
83 This network will be used for internal endpoints.
84 os-public-network:
85+ default:
86 type: string
87 default:
88 description: |
89
90=== modified file 'hooks/swift_context.py'
91--- hooks/swift_context.py 2014-12-19 10:29:32 +0000
92+++ hooks/swift_context.py 2015-02-24 12:50:52 +0000
93@@ -80,7 +80,7 @@
94 def __call__(self):
95 bind_port = config('bind-port')
96 workers = config('workers')
97- if workers == '0':
98+ if workers == 0:
99 import multiprocessing
100 workers = multiprocessing.cpu_count()
101 if config('prefer-ipv6'):
102
103=== modified file 'tests/basic_deployment.py'
104--- tests/basic_deployment.py 2015-01-05 13:43:32 +0000
105+++ tests/basic_deployment.py 2015-02-24 12:50:52 +0000
106@@ -369,7 +369,6 @@
107 expected = {
108 'DEFAULT': {
109 'bind_port': '8070',
110- 'workers': '0',
111 'user': 'swift'
112 },
113 'pipeline:main': {
114@@ -462,7 +461,6 @@
115 expected = {
116 'DEFAULT': {
117 'bind_port': '8070',
118- 'workers': '0',
119 'user': 'swift'
120 },
121 'pipeline:main': {
122@@ -547,7 +545,6 @@
123 expected = {
124 'DEFAULT': {
125 'bind_port': '8070',
126- 'workers': '0',
127 'user': 'swift'
128 },
129 'pipeline:main': {
130@@ -632,7 +629,6 @@
131 expected = {
132 'DEFAULT': {
133 'bind_port': '8070',
134- 'workers': '0',
135 'user': 'swift'
136 },
137 'pipeline:main': {
138@@ -713,7 +709,6 @@
139 expected = {
140 'DEFAULT': {
141 'bind_port': '8070',
142- 'workers': '0',
143 'user': 'swift'
144 },
145 'pipeline:main': {

Subscribers

People subscribed via source and target branches