Merge lp:~ahasenack/landscape-charm/new-dense-target-experiment into lp:~landscape/landscape-charm/trunk

[Andreas Hasenack]

New deployer target called "landscape-dense", that deploys a working LDS on the bootstrap node on providers other than MAAS.

This adds a new deployer target called "landscape-dense". It's just like "landscape-dense-maas", but works on other providers where containers don't get routable IP addresses.

The trick is simple: we only need the frontend (apache2) to be reachable from the "outside". So I co-locate apache2 on the bootstrap node, and deploy the rest on containers.

I wondered if we need to keep the maas-only target. It's cleaner, in the sense that no hulk-smashing is done. But landscape-dense works everywhere. Discuss! :)

[Geoff Teale (tealeg)]

+1 Tested on scapestack, works a treat!

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, but to really test this you need to deploy the bundle on an environment that is not MAAS, because on MAAS the containers get routable IP addresses :)

[Free Ekanayaka (free.ekanayaka)]

+1

As mentioned at standup, Juju is going to implement containers routing for non-MAAS providers, so this code might eventually become obsolete.

review: Approve

=== modified file 'README.md'
--- README.md	2014-07-17 00:49:18 +0000
+++ README.md	2014-07-29 17:53:29 +0000
@@ -130,6 +130,7 @@
 deployment targets available:
 
   * landscape
+  * landscape-dense
   * landscape-dense-maas
 
 Targets that start with an underscore should be ignored as they are used
@@ -156,15 +157,34 @@
  * add another database unit if you want database replication. The replication
    configuration happens automatically.
 
-Landscape dense target
-----------------------
-If you are using juju backed by the MAAS provider, and have big enough machines
-registered with MAAS, you can try out the landscape-dense-maas target.  It
-behaves like its "landscape" counterpart, but everything is deployed into the
-bootstrap node using LXC.
-
-The reason it only works with MAAS for now is that MAAS is the only provider so
-far that can offer external network connectivity to units deployed into LXC.
+"landscape-dense" target
+------------------------
+The "landscape-dense" target deploys everything on the bootstrap node in the
+following way:
+  * apache2, the frontend, is deployed directly on the bootstrap node,
+    using the co-location feature
+  * the other services are deployed into containers
+
+On non-MAAS providers, containers do not get routable IP addresses. But the
+only service that needs to be reachable from the "outside" is the frontend, so
+it doesn't matter that, for example, postgresql or rabbitmq-server or any of
+the other services have private internal-only addresses. Apache2 can still
+see them and proxy connections as needed.
+
+You will need a big enough bootstrap machine for this deployment. Comfortable
+constraints are:
+  * 20Gb disk for deployment and OS (about half used for /var/lib)
+  * 10Gb of RAM
+
+"landscape-dense-maas" target
+-----------------------------
+The "landscape-dense-maas" target is just like the "landscape-dense" one,
+but everything is deployed using containers. Even the frontend.
+
+This works when MAAS is the provider because in this case containers get
+routable IP addresses, so the frontend can be inside a container too.
+
+The hardware constraints are the same as for the "landscape-dense" target.
 
 Customized deployments
 -----------------------

=== modified file 'config/landscape-deployments.yaml'
--- config/landscape-deployments.yaml	2014-07-24 11:07:56 +0000
+++ config/landscape-deployments.yaml	2014-07-29 17:53:29 +0000
@@ -58,6 +58,12 @@
         - [landscape-msg, haproxy]
         - ["landscape-msg:db-admin", "postgresql:db-admin"]
 
+landscape-dense:
+    inherits: landscape-dense-maas
+    services:
+        apache2:
+            to: 0
+
 landscape-dense-maas:
     inherits: landscape
     services: