Landscape Charm

Merge lp:~simpoir/landscape-charm/trivial_doc_updates into lp:~landscape/landscape-charm/trunk

  1. trivial_doc_updates
  2. Merge into trunk
Proposed by Simon Poirier
Status: Merged
Approved by: Simon Poirier
Approved revision: 402
Merged at revision: 401
Proposed branch: lp:~simpoir/landscape-charm/trivial_doc_updates
Merge into: lp:~landscape/landscape-charm/trunk
Diff against target: 32 lines (+4/-7)
2 files modified
README.md (+2/-2)
actions.yaml (+2/-5)
To merge this branch: bzr merge lp:~simpoir/landscape-charm/trivial_doc_updates
Reviewer Review Type Date Requested Status
🤖 Landscape Builder test results Approve
Chris Johnston (community) Approve
Daniel Manrique (community) Approve
Review via email: mp+379981@code.launchpad.net

Commit message

Trivial documentation updates on config and actions.

Description of the change

Trivial documentation updates on config and actions.

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

+1

review: Approve
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 402
Branch: lp:~simpoir/landscape-charm/trivial_doc_updates
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1318/

review: Approve (test results)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.md'
2--- README.md 2019-01-24 18:01:41 +0000
3+++ README.md 2020-02-27 16:18:16 +0000
4@@ -38,9 +38,9 @@
5 license-file
6 ------------
7
8-You can set this as a juju configuration option after deployment on each deployed landscape-service like:
9+You can set this as a juju configuration option after deployment on each deployed landscape-server application like:
10
11- $ juju set <landscape-service> "license-file=$(cat license-file)"
12+ $ juju config landscape-server "license-file=$(cat license-file)"
13
14
15 SSL
16
17=== modified file 'actions.yaml'
18--- actions.yaml 2019-05-28 20:36:35 +0000
19+++ actions.yaml 2020-02-27 16:18:16 +0000
20@@ -1,10 +1,7 @@
21 pause:
22- description: Pause the Landscape unit. This action will interrupt any
23- Landscape-related processing on the unit and prevent any further processing
24- from happening.
25+ description: Pause the Landscape service.
26 resume:
27- description: Resume the Landscape unit. This action will start all the
28- Landscape services on the unit.
29+ description: Resume the Landscape service.
30 upgrade:
31 description: Upgrade software on the Landscape unit. This action will update
32 APT package indexes and upgrade the landscape-server package.

Subscribers

People subscribed via source and target branches