OpenStack DBaaS (Trove)

Merge lp:~corey.bryant/trove/2015.1-b2-0ubuntu1 into lp:~ubuntu-server-dev/trove/kilo

  1. 2015.1-b2-0ubuntu1
  2. Merge into kilo
Proposed by Corey Bryant
Status: Merged
Merged at revision: 44
Proposed branch: lp:~corey.bryant/trove/2015.1-b2-0ubuntu1
Merge into: lp:~ubuntu-server-dev/trove/kilo
Diff against target: 208 lines (+42/-24)
4 files modified
debian/changelog (+9/-0)
debian/control (+18/-10)
debian/patches/fix-requirements.patch (+4/-2)
debian/patches/patch-default-config-file.patch (+11/-12)
To merge this branch: bzr merge lp:~corey.bryant/trove/2015.1-b2-0ubuntu1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+249539@code.launchpad.net
To post a comment you must log in.
lp:~corey.bryant/trove/2015.1-b2-0ubuntu1 updated
45. By Corey Bryant

Add dash to python-oslo-* dependencies

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-01-14 16:29:02 +0000
3+++ debian/changelog 2015-02-12 17:05:25 +0000
4@@ -1,3 +1,12 @@
5+openstack-trove (2015.1~b2-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * New upstream release.
8+ - d/control: Align with upstream dependencies.
9+ - d/p/fix-requirements.patch: Rebased.
10+ - d/p/patch-default-config-file.patch: Rebased.
11+
12+ -- Corey Bryant <corey.bryant@canonical.com> Fri, 06 Feb 2015 10:20:58 -0500
13+
14 openstack-trove (2015.1~b1-0ubuntu3) vivid; urgency=medium
15
16 * Rebuild to pick up pkgos upstart generation fix.
17
18=== modified file 'debian/control'
19--- debian/control 2015-01-14 15:52:33 +0000
20+++ debian/control 2015-02-12 17:05:25 +0000
21@@ -16,8 +16,8 @@
22 Build-Depends-Indep: python-babel (>= 1.3),
23 python-cinderclient (>= 1:1.1.0),
24 python-coverage (>= 3.6),
25- python-designateclient,
26- python-eventlet (>= 0.15.2),
27+ python-designateclient (>= 1.0.0),
28+ python-eventlet (>= 0.16.1),
29 python-extras,
30 python-hacking (>= 0.8.0),
31 python-heatclient (>= 0.2.9),
32@@ -25,7 +25,7 @@
33 python-iso8601 (>= 0.1.9),
34 python-jinja2 (>= 2.6),
35 python-jsonschema (>= 2.0.0),
36- python-keystoneclient (>= 1:0.11.1),
37+ python-keystoneclient (>= 1:1.0.0),
38 python-kombu (>= 2.5.0),
39 python-lxml (>= 2.3),
40 python-keystonemiddleware (>= 1.0.0),
41@@ -39,8 +39,12 @@
42 python-nose,
43 python-nosexcover,
44 python-novaclient (>= 1:2.18.0),
45- python-oslo.config (>= 1:1.4.0),
46- python-oslo.utils (>= 1.1.0),
47+ python-oslo-concurrency (>= 1.4.1),
48+ python-oslo-config (>= 1:1.6.0),
49+ python-oslo-i18n (>= 1.3.0),
50+ python-oslo-messaging (>= 1.6.0),
51+ python-oslo-serialization (>= 1.2.0),
52+ python-oslo-utils (>= 1.2.0),
53 python-oslosphinx (>= 2.2.0),
54 python-passlib,
55 python-paste,
56@@ -67,15 +71,15 @@
57 Section: python
58 Depends: python-babel (>= 1.3),
59 python-cinderclient (>= 1:1.1.0),
60- python-designateclient,
61- python-eventlet (>= 0.15.2),
62+ python-designateclient (>= 1.0.0),
63+ python-eventlet (>= 0.16.1),
64 python-extras,
65 python-heatclient (>= 0.2.9),
66 python-httplib2 (>= 0.7.5),
67 python-iso8601 (>= 0.1.9),
68 python-jinja2 (>= 2.6),
69 python-jsonschema (>= 2.0.0),
70- python-keystoneclient (>= 1:0.11.1),
71+ python-keystoneclient (>= 1:1.0.0),
72 python-kombu (>= 2.5.0),
73 python-lxml (>= 2.3),
74 python-keystonemiddleware (>= 1.0.0),
75@@ -85,8 +89,12 @@
76 python-netifaces (>= 0.10.4),
77 python-neutronclient (>= 1:2.3.6),
78 python-novaclient (>= 1:2.18.0),
79- python-oslo.config (>= 1:1.4.0),
80- python-oslo.utils (>= 1.1.0),
81+ python-oslo-concurrency (>= 1.4.1),
82+ python-oslo-config (>= 1:1.6.0),
83+ python-oslo-i18n (>= 1.3.0),
84+ python-oslo-messaging (>= 1.6.0),
85+ python-oslo-serialization (>= 1.2.0),
86+ python-oslo-utils (>= 1.2.0),
87 python-paste,
88 python-pastedeploy (>= 1.5.0),
89 python-passlib,
90
91=== modified file 'debian/patches/fix-requirements.patch'
92--- debian/patches/fix-requirements.patch 2015-01-06 19:56:55 +0000
93+++ debian/patches/fix-requirements.patch 2015-02-12 17:05:25 +0000
94@@ -1,17 +1,19 @@
95 --- a/requirements.txt
96 +++ b/requirements.txt
97-@@ -33,4 +33,3 @@
98+@@ -36,6 +36,5 @@
99 Babel>=1.3
100 six>=1.7.0
101 stevedore>=1.1.0 # Apache-2.0
102 -ordereddict
103+ oslo.messaging>=1.4.0,!=1.5.0
104+
105 --- a/test-requirements.txt
106 +++ b/test-requirements.txt
107 @@ -9,15 +9,10 @@
108 coverage>=3.6
109 nose
110 nosexcover
111--openstack-doc-tools>=0.20
112+-openstack-doc-tools>=0.21.1
113 -openstack.nose_plugin>=0.7
114 WebTest>=2.0
115 -wsgi_intercept>=0.6.1 # MIT License
116
117=== modified file 'debian/patches/patch-default-config-file.patch'
118--- debian/patches/patch-default-config-file.patch 2014-10-13 19:47:45 +0000
119+++ debian/patches/patch-default-config-file.patch 2015-02-12 17:05:25 +0000
120@@ -21,7 +21,7 @@
121
122 # Address to bind the API server
123 bind_host = 0.0.0.0
124-@@ -33,7 +33,7 @@ bind_port = 8779
125+@@ -50,7 +50,7 @@
126 #rabbit_userid=guest
127
128 # The RabbitMQ password. (string value)
129@@ -30,7 +30,7 @@
130
131 # The RabbitMQ virtual host. (string value)
132 #rabbit_virtual_host=/
133-@@ -47,8 +47,9 @@ rpc_backend = trove.openstack.common.rpc
134+@@ -59,8 +59,9 @@
135 # registry server. Any valid SQLAlchemy connection string is fine.
136 # See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
137 # sql_connection = sqlite:///trove_test.sqlite
138@@ -43,21 +43,20 @@
139 # to the database.
140 --- a/etc/trove/trove-conductor.conf.sample
141 +++ b/etc/trove/trove-conductor.conf.sample
142-@@ -1,9 +1,10 @@
143+@@ -1,8 +1,9 @@
144 [DEFAULT]
145 -verbose = True
146 -debug = True
147 +verbose = False
148 +debug = False
149- control_exchange = trove
150 trove_auth_url = http://0.0.0.0:5000/v2.0
151 -sql_connection = mysql://root:e1a2c042c828d3566d0a@localhost/trove
152 +# sql_connection = mysql://root:e1a2c042c828d3566d0a@localhost/trove
153 +sql_connection = sqlite:////var/lib/trove/trove.sqlite
154
155- # The RabbitMQ broker address where a single node is used.
156- # (string value)
157-@@ -23,7 +24,7 @@ sql_connection = mysql://root:e1a2c042c8
158+ #===================== RPC Configuration =================================
159+
160+@@ -39,7 +40,7 @@
161 #rabbit_userid=guest
162
163 # The RabbitMQ password. (string value)
164@@ -68,7 +67,7 @@
165 #rabbit_virtual_host=/
166 --- a/etc/trove/trove-guestagent.conf.sample
167 +++ b/etc/trove/trove-guestagent.conf.sample
168-@@ -4,7 +4,7 @@
169+@@ -19,7 +19,7 @@
170
171 # The RabbitMQ broker address where a single node is used.
172 # (string value)
173@@ -77,7 +76,7 @@
174
175 # The RabbitMQ broker port where a single node is used.
176 # (integer value)
177-@@ -20,7 +20,7 @@ rabbit_host=10.0.0.1
178+@@ -35,7 +35,7 @@
179 # rabbit_userid=guest
180
181 # The RabbitMQ password. (string value)
182@@ -86,7 +85,7 @@
183
184 # The RabbitMQ virtual host. (string value)
185 # rabbit_virtual_host=/
186-@@ -91,10 +91,10 @@ control_exchange = trove
187+@@ -96,10 +96,10 @@
188 # ========== Sample Logging Configuration ==========
189
190 # Show more verbose log output (sets INFO log level output)
191@@ -113,7 +112,7 @@
192
193 # Update the service and instance statuses if the instances fails to become
194 # active within the configured usage_timeout.
195-@@ -29,7 +29,7 @@ update_status_on_fail = True
196+@@ -46,7 +46,7 @@
197 #rabbit_userid=guest
198
199 # The RabbitMQ password. (string value)
200@@ -122,7 +121,7 @@
201
202 # The RabbitMQ virtual host. (string value)
203 #rabbit_virtual_host=/
204-@@ -42,8 +42,9 @@ rpc_backend = trove.openstack.common.rpc
205+@@ -54,8 +54,9 @@
206 # SQLAlchemy connection string for the reference implementation
207 # registry server. Any valid SQLAlchemy connection string is fine.
208 # See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine

Subscribers

People subscribed via source and target branches