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

[Adam Collard]

Switch to 19.01, update README

Switch to 19.01, update README

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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)]

+1 works form me

review: Approve

=== modified file 'README.md'
--- README.md	2017-02-16 10:19:03 +0000
+++ README.md	2019-01-24 18:11:57 +0000
@@ -1,43 +1,31 @@
 Overview
 ========
-
-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.
-
-This charm will deploy Landscape Dedicated Server (LDS), and needs to be
-connected to other charms to be fully functional. Example deployments are given
-below.
+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.
+
+This charm will deploy Landscape On Premises, and needs to be connected to other charms to be fully functional. Example deployments are given below.
 
 For more information about Landscape, go to http://www.ubuntu.com/management
 
 Standard Usage
 ==============
 
-The typical deployment of Landscape happens using a Juju bundle. This charm is
-not useful without a deployed bundle of services.
+The typical deployment of Landscape happens using a Juju bundle. This charm is not useful without a deployed bundle of services.
 
 Please use one of the following bundle types depending on your needs:
 
-  https://jujucharms.com/u/landscape/landscape-scalable/
-  https://jujucharms.com/u/landscape/landscape-dense-maas/
-  https://jujucharms.com/u/landscape/landscape-dense/
+*  https://jujucharms.com/landscape-scalable/
+*  https://jujucharms.com/landscape-dense-maas/
+*  https://jujucharms.com/landscape-dense/
 
 For the landscape-scalable case:
 
-  sudo apt-add-repository ppa:juju/stable
-  sudo apt-get update
-  juju quickstart u/landscape/landscape-scalable
-
-
-Customized Deployments
+    $ juju deploy landscape-scalable
+
+
+Customised Deployments
 ======================
 
-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 quickstart.
+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.
 
 On the bundle page, download the `bundle.yaml` file.
 
@@ -45,18 +33,12 @@
 Configuration
 =============
 
-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 LDS.  All information is found by following a link 
-on the left side of the page called "access the Landscape Dedicated Server 
-archive"
+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"
 
 license-file
 ------------
 
-You can set this as a juju configuration option after deployment
-on each deployed landscape-service like:
+You can set this as a juju configuration option after deployment on each deployed landscape-service like:
 
     $ juju set <landscape-service> "license-file=$(cat license-file)"
 
@@ -64,21 +46,15 @@
 SSL
 ===
 
-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.
+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.
 
-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).
+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).
 
 
 Unit Testing
 ============
 
-The Landscape charm is fairly well unit tested and new code changes
-should be submitted with unit tests.  You can run them like this:
+The Landscape charm is fairly well unit tested and new code changes should be submitted with unit tests.  You can run them like this:
 
     $ make test
 
@@ -86,16 +62,13 @@
 Integration Testing
 ===================
 
-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:
+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:
 
     $ juju bootstrap localhost
     $ make integration-test
 
-Or if you want to use the LDS packages from the lds-trunk PPA:
+Or if you want to use the packages from the lds-trunk PPA:
 
     $ JUJU_MODEL=<model> make integration-test-trunk
 
-The JUJU_MDOEL environment variable can be omitted if you want to use the
-current model.
+The JUJU_MODEL environment variable can be omitted if you want to use the current model.

=== modified file 'config.yaml'
--- config.yaml	2019-01-17 14:23:55 +0000
+++ config.yaml	2019-01-24 18:11:57 +0000
@@ -1,6 +1,6 @@
 options:
     install_sources:
-        default: "['ppa:landscape/18.03']"
+        default: "['ppa:landscape/19.01']"
         type: string
         description: >
           List of extra apt sources, per charm-helpers standard format (a