Launchpad Mojo Specs

Merge ~cjwatson/launchpad-mojo-specs:set-service-options-manifest into launchpad-mojo-specs:master

  1. Git
  2. lp:~cjwatson/launchpad-mojo-specs
  3. set-service-options-manifest
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Merged at revision: 9bb8dd83cf3025a6048a44c67c02411fa8364b08
Proposed branch: ~cjwatson/launchpad-mojo-specs:set-service-options-manifest
Merge into: launchpad-mojo-specs:master
Diff against target: 39 lines (+4/-2)
4 files modified
mojo-lp-git/manifests/set-service-options (+1/-0)
mojo-lp-git/manifests/upgrade-deployment (+1/-1)
mojo-lp-webhooks-proxy/manifests/set-service-options (+1/-0)
mojo-lp-webhooks-proxy/manifests/upgrade-deployment (+1/-1)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+377406@code.launchpad.net

Commit message

Add set-service-options manifests

Description of the change

These are convenient when cowboying config changes.

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/mojo-lp-git/manifests/set-service-options b/mojo-lp-git/manifests/set-service-options
2new file mode 100644
3index 0000000..dbb0ed8
4--- /dev/null
5+++ b/mojo-lp-git/manifests/set-service-options
6@@ -0,0 +1 @@
7+script config=utils/set-service-options
8diff --git a/mojo-lp-git/manifests/upgrade-deployment b/mojo-lp-git/manifests/upgrade-deployment
9index ba6da57..e59aa7a 100644
10--- a/mojo-lp-git/manifests/upgrade-deployment
11+++ b/mojo-lp-git/manifests/upgrade-deployment
12@@ -2,7 +2,7 @@ include config=manifests/verify
13 collect config=collect-charm-upgrades
14 script config=predeploy
15 script config=upgrade-charms
16-script config=utils/set-service-options
17+include config=manifests/set-service-options
18 deploy config=services delay=0 local=deploy-secrets
19 juju-check-wait
20 script config=postdeploy
21diff --git a/mojo-lp-webhooks-proxy/manifests/set-service-options b/mojo-lp-webhooks-proxy/manifests/set-service-options
22new file mode 100644
23index 0000000..dbb0ed8
24--- /dev/null
25+++ b/mojo-lp-webhooks-proxy/manifests/set-service-options
26@@ -0,0 +1 @@
27+script config=utils/set-service-options
28diff --git a/mojo-lp-webhooks-proxy/manifests/upgrade-deployment b/mojo-lp-webhooks-proxy/manifests/upgrade-deployment
29index b0db37e..129950e 100644
30--- a/mojo-lp-webhooks-proxy/manifests/upgrade-deployment
31+++ b/mojo-lp-webhooks-proxy/manifests/upgrade-deployment
32@@ -1,6 +1,6 @@
33 include config=manifests/verify
34 ## collect config=collect-upgrades
35-script config=utils/set-service-options
36+include config=manifests/set-service-options
37 deploy config=services delay=0
38 juju-check-wait
39 script config=postdeploy

Subscribers

People subscribed via source and target branches