Merge ~cjwatson/launchpad-mojo-specs:set-service-options-manifest into launchpad-mojo-specs: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
diff --git a/mojo-lp-git/manifests/set-service-options b/mojo-lp-git/manifests/set-service-options
0new file mode 1006440new file mode 100644
index 0000000..dbb0ed8
--- /dev/null
+++ b/mojo-lp-git/manifests/set-service-options
@@ -0,0 +1 @@
1script config=utils/set-service-options
diff --git a/mojo-lp-git/manifests/upgrade-deployment b/mojo-lp-git/manifests/upgrade-deployment
index ba6da57..e59aa7a 100644
--- a/mojo-lp-git/manifests/upgrade-deployment
+++ b/mojo-lp-git/manifests/upgrade-deployment
@@ -2,7 +2,7 @@ include config=manifests/verify
2collect config=collect-charm-upgrades2collect config=collect-charm-upgrades
3script config=predeploy3script config=predeploy
4script config=upgrade-charms4script config=upgrade-charms
5script config=utils/set-service-options5include config=manifests/set-service-options
6deploy config=services delay=0 local=deploy-secrets6deploy config=services delay=0 local=deploy-secrets
7juju-check-wait7juju-check-wait
8script config=postdeploy8script config=postdeploy
diff --git a/mojo-lp-webhooks-proxy/manifests/set-service-options b/mojo-lp-webhooks-proxy/manifests/set-service-options
9new file mode 1006449new file mode 100644
index 0000000..dbb0ed8
--- /dev/null
+++ b/mojo-lp-webhooks-proxy/manifests/set-service-options
@@ -0,0 +1 @@
1script config=utils/set-service-options
diff --git a/mojo-lp-webhooks-proxy/manifests/upgrade-deployment b/mojo-lp-webhooks-proxy/manifests/upgrade-deployment
index b0db37e..129950e 100644
--- a/mojo-lp-webhooks-proxy/manifests/upgrade-deployment
+++ b/mojo-lp-webhooks-proxy/manifests/upgrade-deployment
@@ -1,6 +1,6 @@
1include config=manifests/verify1include config=manifests/verify
2## collect config=collect-upgrades2## collect config=collect-upgrades
3script config=utils/set-service-options3include config=manifests/set-service-options
4deploy config=services delay=04deploy config=services delay=0
5juju-check-wait5juju-check-wait
6script config=postdeploy6script config=postdeploy

Subscribers

People subscribed via source and target branches