Launchpad itself

Merge ~cjwatson/launchpad:charm-db-layer into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. charm-db-layer
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: e2a71a500b0ed10287d581feec8a162a065f88c0
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:charm-db-layer
Merge into: launchpad:master
Diff against target: 315 lines (+58/-36)
13 files modified
charm/launchpad-admin/charmcraft.yaml (+3/-1)
charm/launchpad-admin/layer.yaml (+1/-1)
charm/launchpad-admin/reactive/launchpad-admin.py (+10/-10)
charm/launchpad-admin/templates/launchpad-admin-lazr.conf (+1/-1)
charm/launchpad-appserver/charmcraft.yaml (+3/-1)
charm/launchpad-appserver/layer.yaml (+1/-1)
charm/launchpad-appserver/reactive/launchpad-appserver.py (+14/-8)
charm/launchpad-appserver/templates/launchpad-appserver-lazr.conf (+1/-1)
charm/launchpad-librarian/charmcraft.yaml (+3/-1)
charm/launchpad-librarian/layer.yaml (+1/-1)
charm/launchpad-librarian/reactive/launchpad-librarian.py (+17/-8)
charm/launchpad-librarian/templates/launchpad-librarian-lazr.conf (+1/-1)
charm/launchpad/charmcraft.yaml (+2/-1)
Reviewer Review Type Date Requested Status
Guruprasad Approve
Review via email: mp+442740@code.launchpad.net

Commit message

charm: Update launchpad-layers to 42a4b4c4f6

Description of the change

This splits out new `launchpad-payload` and `launchpad-db` layers, requiring some minor restructuring of individual charms.

To post a comment you must log in.
Revision history for this message
Guruprasad (lgp171188) wrote :

LGTM 👍🏼

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/launchpad-admin/charmcraft.yaml b/charm/launchpad-admin/charmcraft.yaml
2index e640df9..c27c604 100644
3--- a/charm/launchpad-admin/charmcraft.yaml
4+++ b/charm/launchpad-admin/charmcraft.yaml
5@@ -35,12 +35,14 @@ parts:
6 after:
7 - ols-layers
8 source: https://git.launchpad.net/launchpad-layers
9- source-commit: "6a50917f5f6163069ae1661e3320abb5b48173a3"
10+ source-commit: "42a4b4c4f62936b1d050c775e84f7364dfb5efc0"
11 source-submodules: []
12 source-type: git
13 plugin: dump
14 organize:
15 launchpad-base: layers/layer/launchpad-base
16+ launchpad-db: layers/layer/launchpad-db
17+ launchpad-payload: layers/layer/launchpad-payload
18 stage:
19 - layers
20 prime:
21diff --git a/charm/launchpad-admin/layer.yaml b/charm/launchpad-admin/layer.yaml
22index 352e6d4..46351e2 100644
23--- a/charm/launchpad-admin/layer.yaml
24+++ b/charm/launchpad-admin/layer.yaml
25@@ -1,5 +1,5 @@
26 includes:
27- - layer:launchpad-base
28+ - layer:launchpad-db
29 repo: https://git.launchpad.net/launchpad
30 options:
31 apt:
32diff --git a/charm/launchpad-admin/reactive/launchpad-admin.py b/charm/launchpad-admin/reactive/launchpad-admin.py
33index 3d44168..0d3d311 100644
34--- a/charm/launchpad-admin/reactive/launchpad-admin.py
35+++ b/charm/launchpad-admin/reactive/launchpad-admin.py
36@@ -5,14 +5,9 @@ import os.path
37 import subprocess
38
39 from charmhelpers.core import hookenv, host, templating
40-from charms.launchpad.base import (
41- configure_email,
42- configure_lazr,
43- get_service_config,
44- home_dir,
45- strip_dsn_authentication,
46- update_pgpass,
47-)
48+from charms.launchpad.base import configure_email, get_service_config
49+from charms.launchpad.db import strip_dsn_authentication, update_pgpass
50+from charms.launchpad.payload import configure_lazr, home_dir
51 from charms.reactive import (
52 endpoint_from_flag,
53 remove_state,
54@@ -80,7 +75,7 @@ def update_database_permissions():
55
56
57 @when(
58- "launchpad.base.configured",
59+ "launchpad.db.configured",
60 "db.master.available",
61 "db-admin.master.available",
62 "session-db.master.available",
63@@ -145,7 +140,12 @@ def configure():
64
65
66 @when("service.configured")
67-@when_not_all("db-admin.master.available", "session-db.master.available")
68+@when_not_all(
69+ "launchpad.db.configured",
70+ "db.master.available",
71+ "db-admin.master.available",
72+ "session-db.master.available",
73+)
74 def deconfigure():
75 remove_state("service.configured")
76
77diff --git a/charm/launchpad-admin/templates/launchpad-admin-lazr.conf b/charm/launchpad-admin/templates/launchpad-admin-lazr.conf
78index 24a41f9..781303a 100644
79--- a/charm/launchpad-admin/templates/launchpad-admin-lazr.conf
80+++ b/charm/launchpad-admin/templates/launchpad-admin-lazr.conf
81@@ -9,7 +9,7 @@
82 {% from "macros.j2" import opt -%}
83
84 [meta]
85-extends: ../launchpad-base-lazr.conf
86+extends: ../launchpad-db-lazr.conf
87
88 [database]
89 rw_main_primary: {{ db_admin_primary }}
90diff --git a/charm/launchpad-appserver/charmcraft.yaml b/charm/launchpad-appserver/charmcraft.yaml
91index 14708d5..5e7f772 100644
92--- a/charm/launchpad-appserver/charmcraft.yaml
93+++ b/charm/launchpad-appserver/charmcraft.yaml
94@@ -35,12 +35,14 @@ parts:
95 after:
96 - ols-layers
97 source: https://git.launchpad.net/launchpad-layers
98- source-commit: "6a50917f5f6163069ae1661e3320abb5b48173a3"
99+ source-commit: "42a4b4c4f62936b1d050c775e84f7364dfb5efc0"
100 source-submodules: []
101 source-type: git
102 plugin: dump
103 organize:
104 launchpad-base: layers/layer/launchpad-base
105+ launchpad-db: layers/layer/launchpad-db
106+ launchpad-payload: layers/layer/launchpad-payload
107 stage:
108 - layers
109 prime:
110diff --git a/charm/launchpad-appserver/layer.yaml b/charm/launchpad-appserver/layer.yaml
111index 87a5643..1401723 100644
112--- a/charm/launchpad-appserver/layer.yaml
113+++ b/charm/launchpad-appserver/layer.yaml
114@@ -1,5 +1,5 @@
115 includes:
116- - layer:launchpad-base
117+ - layer:launchpad-db
118 - layer:coordinator
119 - interface:memcache
120 repo: https://git.launchpad.net/launchpad
121diff --git a/charm/launchpad-appserver/reactive/launchpad-appserver.py b/charm/launchpad-appserver/reactive/launchpad-appserver.py
122index 61cd796..ad4b439 100644
123--- a/charm/launchpad-appserver/reactive/launchpad-appserver.py
124+++ b/charm/launchpad-appserver/reactive/launchpad-appserver.py
125@@ -7,16 +7,17 @@ from multiprocessing import cpu_count
126
127 from charmhelpers.core import hookenv, host, templating
128 from charms.coordinator import acquire
129-from charms.launchpad.base import (
130- config_file_path,
131- configure_cron,
132- configure_email,
133- configure_lazr,
134- get_service_config,
135+from charms.launchpad.base import configure_email, get_service_config
136+from charms.launchpad.db import (
137 lazr_config_files,
138 strip_dsn_authentication,
139 update_pgpass,
140 )
141+from charms.launchpad.payload import (
142+ config_file_path,
143+ configure_cron,
144+ configure_lazr,
145+)
146 from charms.reactive import (
147 clear_flag,
148 endpoint_from_flag,
149@@ -28,6 +29,7 @@ from charms.reactive import (
150 when,
151 when_none,
152 when_not,
153+ when_not_all,
154 )
155 from ols import base, postgres
156 from psycopg2.extensions import parse_dsn
157@@ -93,7 +95,7 @@ def config_files():
158
159
160 @when(
161- "launchpad.base.configured",
162+ "launchpad.db.configured",
163 "session-db.master.available",
164 "memcache.available",
165 )
166@@ -155,7 +157,11 @@ def check_is_running():
167
168
169 @when("service.configured")
170-@when_not("session-db.master.available")
171+@when_not_all(
172+ "launchpad.db.configured",
173+ "session-db.master.available",
174+ "memcache.available",
175+)
176 def deconfigure():
177 remove_state("service.configured")
178
179diff --git a/charm/launchpad-appserver/templates/launchpad-appserver-lazr.conf b/charm/launchpad-appserver/templates/launchpad-appserver-lazr.conf
180index a7e2c95..642d52e 100644
181--- a/charm/launchpad-appserver/templates/launchpad-appserver-lazr.conf
182+++ b/charm/launchpad-appserver/templates/launchpad-appserver-lazr.conf
183@@ -9,7 +9,7 @@
184 {% from "macros.j2" import opt -%}
185
186 [meta]
187-extends: ../launchpad-base-lazr.conf
188+extends: ../launchpad-db-lazr.conf
189
190 [bing]
191 {{- opt("custom_config_id", bing_custom_config_id) }}
192diff --git a/charm/launchpad-librarian/charmcraft.yaml b/charm/launchpad-librarian/charmcraft.yaml
193index f56aaa5..07b75c0 100644
194--- a/charm/launchpad-librarian/charmcraft.yaml
195+++ b/charm/launchpad-librarian/charmcraft.yaml
196@@ -35,12 +35,14 @@ parts:
197 after:
198 - ols-layers
199 source: https://git.launchpad.net/launchpad-layers
200- source-commit: "6a50917f5f6163069ae1661e3320abb5b48173a3"
201+ source-commit: "42a4b4c4f62936b1d050c775e84f7364dfb5efc0"
202 source-submodules: []
203 source-type: git
204 plugin: dump
205 organize:
206 launchpad-base: layers/layer/launchpad-base
207+ launchpad-db: layers/layer/launchpad-db
208+ launchpad-payload: layers/layer/launchpad-payload
209 stage:
210 - layers
211 prime:
212diff --git a/charm/launchpad-librarian/layer.yaml b/charm/launchpad-librarian/layer.yaml
213index 4e629d0..cdfe1c7 100644
214--- a/charm/launchpad-librarian/layer.yaml
215+++ b/charm/launchpad-librarian/layer.yaml
216@@ -1,5 +1,5 @@
217 includes:
218- - layer:launchpad-base
219+ - layer:launchpad-db
220 repo: https://git.launchpad.net/launchpad
221 options:
222 apt:
223diff --git a/charm/launchpad-librarian/reactive/launchpad-librarian.py b/charm/launchpad-librarian/reactive/launchpad-librarian.py
224index 349f22a..67cc398 100644
225--- a/charm/launchpad-librarian/reactive/launchpad-librarian.py
226+++ b/charm/launchpad-librarian/reactive/launchpad-librarian.py
227@@ -5,16 +5,17 @@ import os.path
228 import subprocess
229
230 from charmhelpers.core import hookenv, host, templating
231-from charms.launchpad.base import (
232- config_file_path,
233- configure_cron,
234- configure_email,
235- configure_lazr,
236- get_service_config,
237+from charms.launchpad.base import configure_email, get_service_config
238+from charms.launchpad.db import (
239 lazr_config_files,
240 strip_dsn_authentication,
241 update_pgpass,
242 )
243+from charms.launchpad.payload import (
244+ config_file_path,
245+ configure_cron,
246+ configure_lazr,
247+)
248 from charms.reactive import (
249 endpoint_from_flag,
250 helpers,
251@@ -22,6 +23,7 @@ from charms.reactive import (
252 set_state,
253 when,
254 when_not,
255+ when_not_all,
256 )
257 from ols import base, postgres
258 from psycopg2.extensions import parse_dsn
259@@ -73,7 +75,7 @@ def config_files():
260 "config.set.port_restricted_download_base",
261 "config.set.port_restricted_upload_base",
262 "config.set.port_upload_base",
263- "launchpad.base.configured",
264+ "launchpad.db.configured",
265 "session-db.master.available",
266 )
267 @when_not("service.configured")
268@@ -149,7 +151,14 @@ def check_is_running():
269
270
271 @when("service.configured")
272-@when_not("session-db.master.available")
273+@when_not_all(
274+ "config.set.port_download_base",
275+ "config.set.port_restricted_download_base",
276+ "config.set.port_restricted_upload_base",
277+ "config.set.port_upload_base",
278+ "launchpad.db.configured",
279+ "session-db.master.available",
280+)
281 def deconfigure():
282 remove_state("service.configured")
283
284diff --git a/charm/launchpad-librarian/templates/launchpad-librarian-lazr.conf b/charm/launchpad-librarian/templates/launchpad-librarian-lazr.conf
285index 5cc7c8b..a28e217 100644
286--- a/charm/launchpad-librarian/templates/launchpad-librarian-lazr.conf
287+++ b/charm/launchpad-librarian/templates/launchpad-librarian-lazr.conf
288@@ -9,7 +9,7 @@
289 {% from "macros.j2" import opt -%}
290
291 [meta]
292-extends: ../launchpad-base-lazr.conf
293+extends: ../launchpad-db-lazr.conf
294
295 [launchpad_session]
296 database: {{ db_session }}
297diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
298index b3205bf..e7ec243 100644
299--- a/charm/launchpad/charmcraft.yaml
300+++ b/charm/launchpad/charmcraft.yaml
301@@ -35,12 +35,13 @@ parts:
302 after:
303 - ols-layers
304 source: https://git.launchpad.net/launchpad-layers
305- source-commit: "6a50917f5f6163069ae1661e3320abb5b48173a3"
306+ source-commit: "42a4b4c4f62936b1d050c775e84f7364dfb5efc0"
307 source-submodules: []
308 source-type: git
309 plugin: dump
310 organize:
311 launchpad-base: layers/layer/launchpad-base
312+ launchpad-payload: layers/layer/launchpad-payload
313 stage:
314 - layers
315 prime:

Subscribers

People subscribed via source and target branches

to status/vote changes: