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

[Adam Collard]

Update the README to fix some formatting issues and update out of date text.

[lp:~adam-collard/landscape-charm/fix-landscape-readme]

225. By Adam Collard on 2015-04-09

Incorporate formatting suggestions from dpb and ack

Unmerged revisions

225. By Adam Collard on 2015-04-09

Incorporate formatting suggestions from dpb and ack

224. By Adam Collard on 2015-04-08

Update README

223. By David Britton on 2015-03-23

Merge update-readme. [r=fcorrea,dpb] [f=1434732] [a=Dean Henrichsmeyer]
Updated the README to reflect current bundle choices and the recommended way of
deploying Landscape Dedicated Server (LDS)

222. By David Britton on 2015-03-20

- Use hkp:// keyserver urls, as they work behind an http_proxy [r=free] [trivial]

=== modified file 'README.md'
--- README.md	2015-03-27 14:10:50 +0000
+++ README.md	2015-04-08 17:41:30 +0000
@@ -10,6 +10,7 @@
 connected to other charms to be fully functional. Example deployments are given
 below.
 
+<<<<<<< TREE
 For more information about Landscape, go to http://www.ubuntu.com/management
 
 Standard Usage
@@ -40,22 +41,72 @@
 supplying it to juju quickstart.
 
 On the bundle page, download the `bundle.yaml` file.
+=======
+For more information about Landscape, go to [Ubuntu Advantage](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.
+
+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/
+
+For the landscape-scalable case:
+
+    $ sudo apt-add-repository ppa:juju/stable
+    $ sudo apt-get update
+    $ sudo apt-get install juju-quickstart
+    $ juju quickstart u/landscape/landscape-scalable
+
+
+Customized 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.
+
+On the bundle page, download the `bundle.yaml` file.
+>>>>>>> MERGE-SOURCE
 
 
 Configuration
 =============
 
+<<<<<<< TREE
 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 which is bundled with a license
+allowing management of up to 10 physical machines and 10 more virtual
+machines, for a total of 20.
+
+If you need to manage more machines then you'll need to configure a
+license and password protected repository before deployment.  Please
+login to your [hosted account](https://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"
+>>>>>>> MERGE-SOURCE
 
 license-file
 ------------
 
+<<<<<<< TREE
 You can set this as a juju configuration option after deployment
+=======
+You can set this as a Juju configuration option after deployment
+>>>>>>> MERGE-SOURCE
 on each deployed landscape-service like:
 
     $ juju set <landscape-service> "license-file=$(cat license-file)"
@@ -64,25 +115,35 @@
 SSL
 ===
 
+<<<<<<< TREE
 The pre-packaged bundles will ask Apache 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 apache charm
 configuration.
+=======
+The pre-packaged bundles will ask Apache 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 Apache charm
+configuration.
+>>>>>>> MERGE-SOURCE
 
 
 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 unit tested and new code changes should be
+submitted with unit tests.  You can run them like this:
 
     $ sudo apt-get install python-twisted-core
     $ make test
 
 
 Integration Testing
+<<<<<<< TREE
 ===================
 
 This charm makes use of juju-deployer and the charm-tools package to enable
@@ -91,4 +152,16 @@
 
     # Make sure your JUJU_ENV is *not* bootstrapped, and:
     $ sudo apt-get install python-psycopg2 python-mocker python-psutil
+=======
+===================
+
+This charm makes use of
+[juju-deployer](http://pythonhosted.org/juju-deployer/) and
+[charm-tools](https://jujucharms.com/docs/1.20/tools-charm-tools) to
+enable end-to-end integration testing.  This is how you proceed with
+running them:
+
+    # Make sure your JUJU_ENV is *not* bootstrapped, and:
+    $ sudo apt-get install python-pyscopg2 python-mocker python-psutil
+>>>>>>> MERGE-SOURCE
     $ JUJU_ENV=<env> make integration-test

=== modified file 'old/hooks/install'
--- old/hooks/install	2014-06-20 20:11:09 +0000
+++ old/hooks/install	2015-04-08 17:41:30 +0000
@@ -74,8 +74,8 @@
 $1
 EOMSG
     chmod go+r $SOURCES_FILE
-    apt-key adv --keyserver keyserver.ubuntu.com --recv-key D394F4BC
-    apt-key adv --keyserver keyserver.ubuntu.com --recv-key 4652B4E6
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key D394F4BC
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key 4652B4E6
 }
 
 function apt_get() {