Merge lp:~adam-collard/landscape-charm/19.01 into lp:landscape-charm

Proposed by Adam Collard on 2019-01-24
Status: Merged
Approved by: Simon Poirier on 2019-01-24
Approved revision: 397
Merged at revision: 396
Proposed branch: lp:~adam-collard/landscape-charm/19.01
Merge into: lp:landscape-charm
Diff against target: 137 lines (+21/-48)
2 files modified
README.md (+20/-47)
config.yaml (+1/-1)
To merge this branch: bzr merge lp:~adam-collard/landscape-charm/19.01
Reviewer Review Type Date Requested Status
Simon Poirier 2019-01-24 Approve on 2019-01-24
🤖 Landscape Builder test results Approve on 2019-01-24
Review via email: mp+362205@code.launchpad.net

Commit message

Switch to 19.01, update README

Description of the change

Switch to 19.01, update README

To post a comment you must log in.
review: Abstain (executing tests)

Command: make ci-test
Result: Success
Revno: 397
Branch: lp:~adam-collard/landscape-charm/19.01
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3918/

review: Approve (test results)
Simon Poirier (simpoir) wrote :

+1 works form me

review: Approve

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 2017-02-16 10:19:03 +0000
3+++ README.md 2019-01-24 18:11:57 +0000
4@@ -1,43 +1,31 @@
5 Overview
6 ========
7-
8-The Landscape systems management tool helps you monitor, manage and update your
9-entire Ubuntu infrastructure from a single interface. Part of Canonical's
10-Ubuntu Advantage support service, Landscape brings you intuitive systems
11-management tools combined with world-class support.
12-
13-This charm will deploy Landscape Dedicated Server (LDS), and needs to be
14-connected to other charms to be fully functional. Example deployments are given
15-below.
16+The Landscape systems management tool helps you monitor, manage and update your entire Ubuntu infrastructure from a single interface. Part of Canonical's Ubuntu Advantage support service, Landscape brings you intuitive systems management tools combined with world-class support.
17+
18+This charm will deploy Landscape On Premises, and needs to be connected to other charms to be fully functional. Example deployments are given below.
19
20 For more information about Landscape, go to http://www.ubuntu.com/management
21
22 Standard Usage
23 ==============
24
25-The typical deployment of Landscape happens using a Juju bundle. This charm is
26-not useful without a deployed bundle of services.
27+The typical deployment of Landscape happens using a Juju bundle. This charm is not useful without a deployed bundle of services.
28
29 Please use one of the following bundle types depending on your needs:
30
31- https://jujucharms.com/u/landscape/landscape-scalable/
32- https://jujucharms.com/u/landscape/landscape-dense-maas/
33- https://jujucharms.com/u/landscape/landscape-dense/
34+* https://jujucharms.com/landscape-scalable/
35+* https://jujucharms.com/landscape-dense-maas/
36+* https://jujucharms.com/landscape-dense/
37
38 For the landscape-scalable case:
39
40- sudo apt-add-repository ppa:juju/stable
41- sudo apt-get update
42- juju quickstart u/landscape/landscape-scalable
43-
44-
45-Customized Deployments
46+ $ juju deploy landscape-scalable
47+
48+
49+Customised Deployments
50 ======================
51
52-The standard deployment of Landscape will give you the latest released code.
53-If you want a different version, different options, etc, you will need to
54-download one of the bundles, and add/change options in the file before
55-supplying it to juju quickstart.
56+The standard deployment of Landscape will give you the latest released code. If you want a different version, different options, etc, you will need to download one of the bundles, and add/change options in the file before supplying it to juju.
57
58 On the bundle page, download the `bundle.yaml` file.
59
60@@ -45,18 +33,12 @@
61 Configuration
62 =============
63
64-Landscape is a commercial product and as such it needs configuration of a
65-license and password protected repository before deployment. Please login to
66-your "hosted account" (on landscape.canonical.com) to gather these details
67-after purchasing seats for LDS. All information is found by following a link
68-on the left side of the page called "access the Landscape Dedicated Server
69-archive"
70+Landscape is a commercial product and as such it needs configuration of a license and password protected repository before deployment. Please login to your "hosted account" (on landscape.canonical.com) to gather these details after purchasing seats for Landscape On Premises. All information is found by following a link on the left side of the page called "access the Landscape On Premises archive"
71
72 license-file
73 ------------
74
75-You can set this as a juju configuration option after deployment
76-on each deployed landscape-service like:
77+You can set this as a juju configuration option after deployment on each deployed landscape-service like:
78
79 $ juju set <landscape-service> "license-file=$(cat license-file)"
80
81@@ -64,21 +46,15 @@
82 SSL
83 ===
84
85-The pre-packaged bundles will ask the HAProxy charm to generate a self
86-signed certificate. While useful for testing, this must not be used for
87-production deployments.
88+The pre-packaged bundles will ask the HAProxy charm to generate a self signed certificate. While useful for testing, this must not be used for production deployments.
89
90-For production deployments, you should include a "real" SSL certificate key
91-pair that has been signed by a CA that your clients trust in the haproxy service
92-configuration (or in the landscape-server service configuration if you need to
93-use your haproxy service for other services too with different certificates).
94+For production deployments, you should include a "real" SSL certificate key pair that has been signed by a CA that your clients trust in the haproxy service configuration (or in the landscape-server service configuration if you need to use your haproxy service for other services too with different certificates).
95
96
97 Unit Testing
98 ============
99
100-The Landscape charm is fairly well unit tested and new code changes
101-should be submitted with unit tests. You can run them like this:
102+The Landscape charm is fairly well unit tested and new code changes should be submitted with unit tests. You can run them like this:
103
104 $ make test
105
106@@ -86,16 +62,13 @@
107 Integration Testing
108 ===================
109
110-This charm makes use of juju-deployer and the charm-tools package to enable
111-end-to-end integration testing. This is how you proceed with running
112-them:
113+This charm makes use of juju-deployer and the charm-tools package to enable end-to-end integration testing. This is how you proceed with running them:
114
115 $ juju bootstrap localhost
116 $ make integration-test
117
118-Or if you want to use the LDS packages from the lds-trunk PPA:
119+Or if you want to use the packages from the lds-trunk PPA:
120
121 $ JUJU_MODEL=<model> make integration-test-trunk
122
123-The JUJU_MDOEL environment variable can be omitted if you want to use the
124-current model.
125+The JUJU_MODEL environment variable can be omitted if you want to use the current model.
126
127=== modified file 'config.yaml'
128--- config.yaml 2019-01-17 14:23:55 +0000
129+++ config.yaml 2019-01-24 18:11:57 +0000
130@@ -1,6 +1,6 @@
131 options:
132 install_sources:
133- default: "['ppa:landscape/18.03']"
134+ default: "['ppa:landscape/19.01']"
135 type: string
136 description: >
137 List of extra apt sources, per charm-helpers standard format (a

Subscribers

People subscribed via source and target branches