Merge lp:~dpb/landscape-charm/root-disk-constraint into lp:~landscape/landscape-charm/trunk

[David Britton]

add root-disk=10G constraint.

[Adam Collard (adam-collard)]

I think you must have had a stale copy of the charm laying around. This diff is kinda crazy :)

review: Needs Resubmitting

Unmerged revisions

15. By David Britton on 2016-01-29

add root-disk=10G constraint, render

14. By Björn Tillenius on 2015-12-14

Don't set 'charm' if 'branch' is specified for landscape-server. [trivial]

13. By David Britton on 2015-11-16

15.11 source, cleanup some gui annotations that were missing in template.

12. By Andreas Hasenack on 2015-10-14

Merged with the new bundles for the release of LDS 15.10 with the new charm

11. By Adam Collard on 2015-06-09

Fix typo in README.md

10. By David Britton on 2015-03-27

Add GUI annotations into bundles

9. By David Britton on 2015-03-09

Merge Adam Collard 2015-03-09 15.01 > 14.10

8. By David Britton on 2015-03-06

Pass commit message in for charm-store commit helper.

7. By David Britton on 2015-03-06

Fix URLs in README.md to use new API v4 syntax.

6. By David Britton on 2015-03-02

Add simple helper and Makefile for interacting with charm-store [trivial]

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2016-01-29 22:57:08 +0000
@@ -0,0 +1,11 @@
+compare-charm-store:
+	./charm-store
+
+commit-charm-store:
+	CHARM_STORE_COMMIT=1 ./charm-store
+
+clean:
+	@rm -rf build
+
+render:
+	@./render-bundles

=== renamed file 'Makefile' => 'Makefile.moved'
=== added file 'README.md'
--- README.md	1970-01-01 00:00:00 +0000
+++ README.md	2016-01-29 22:57:08 +0000
@@ -0,0 +1,28 @@
+Overview
+========
+
+This branch contains the necessary config and instructions for using
+juju-deployer/juju-quickstart to deploy the landscape charm.
+
+Deployment should be straightforward.
+
+Dense Deployment - MAAS
+=======================
+For MAAS where LXCs can be addressed externally, you can deploy to a single
+machine while at the same time making the service scalable in the future:
+
+  juju quickstart u/landscape/landscape-dense-maas/
+
+Dense Deployment - Other
+========================
+For other substrates, use the plain dense deployment which allows your
+landscape server to be fully reachable, but will not allow easy scaling
+should load increase.
+
+  juju quickstart u/landscape/landscape-dense/
+
+Scalable Deployment
+===================
+For a truly scalable deployment, the following stanza should be used.
+
+  juju quickstart u/landscape/landscape-scalable

=== renamed file 'README.md' => 'README.md.moved'
=== added file 'charm-store'
--- charm-store	1970-01-01 00:00:00 +0000
+++ charm-store	2016-01-29 22:57:08 +0000
@@ -0,0 +1,23 @@
+#!/bin/bash -e
+
+COMMIT=${CHARM_STORE_COMMIT:-}
+
+for i in *.yaml; do
+    revno=$(bzr revno)
+    target=$(basename $i .yaml)
+    if [ -e build/$target ]; then
+        echo "build/$target exists, please remove before continuing (make clean)"
+        exit 1
+    fi
+    mkdir -p build
+    bzr co lp:~landscape/charms/bundles/$target/bundle build/$target
+    cp $target.yaml build/$target/bundles.yaml
+    cp README.md build/$target/README.md
+    if [ "$COMMIT" == "" ]; then
+        echo "Diff from Charm Store: $target"
+        (cd build/$target && bzr diff) || /bin/true
+    else
+        echo "Committing to Charm Store: $target"
+        (cd build/$target && bzr commit -m "$COMMIT (stable: r$revno)")
+    fi
+done

=== added file 'landscape-dense-maas.yaml'
--- landscape-dense-maas.yaml	1970-01-01 00:00:00 +0000
+++ landscape-dense-maas.yaml	2016-01-29 22:57:08 +0000
@@ -0,0 +1,56 @@
+landscape-dense-maas:
+    series: trusty
+    services:
+        rabbitmq-server:
+            charm: cs:trusty/rabbitmq-server-26
+            constraints: root-disk=10G
+            to: lxc:0
+            num_units: 1
+            annotations:
+                "gui-x": "600"
+                "gui-y": "370"
+        postgresql:
+            charm: cs:trusty/postgresql-27
+            constraints: root-disk=10G mem=2048
+            to: lxc:0
+            num_units: 1
+            options:
+                extra-packages: python-apt postgresql-contrib postgresql-.*-debversion
+                max_connections: 500
+                max_prepared_transactions: 500
+            annotations:
+                "gui-x": "600"
+                "gui-y": "120"
+        haproxy:
+            charm: cs:trusty/haproxy-10
+            constraints: root-disk=10G
+            to: lxc:0
+            expose: True
+            num_units: 1
+            options:
+                enable_monitoring: True
+                monitoring_allowed_cidr: "0.0.0.0/0"
+                monitoring_password: "haproxy"
+                default_timeouts: "queue 60000, connect 5000, client 120000, server 120000"
+                # Don't deploy default haproxy service on port 80
+                services: ""
+                source: backports
+                ssl_cert: SELFSIGNED
+            annotations:
+                "gui-x": "1200"
+                "gui-y": "120"
+        landscape-server:
+            charm: cs:trusty/landscape-server
+            constraints: root-disk=10G mem=2048
+            to: lxc:0
+            num_units: 1
+            options:
+                source: deb http://ppa.launchpad.net/landscape/15.11/ubuntu trusty main
+                key: 4652B4E6
+            annotations:
+                "gui-x": "950"
+                "gui-y": "120"
+    relations:
+        - [landscape-server, rabbitmq-server]
+        - [landscape-server, haproxy]
+        - ["landscape-server:db", "postgresql:db-admin"]

=== added file 'landscape-dense.yaml'
--- landscape-dense.yaml	1970-01-01 00:00:00 +0000
+++ landscape-dense.yaml	2016-01-29 22:57:08 +0000
@@ -0,0 +1,56 @@
+landscape-dense:
+    series: trusty
+    services:
+        rabbitmq-server:
+            charm: cs:trusty/rabbitmq-server-26
+            constraints: root-disk=10G
+            to: lxc:0
+            num_units: 1
+            annotations:
+                "gui-x": "600"
+                "gui-y": "370"
+        postgresql:
+            charm: cs:trusty/postgresql-27
+            constraints: root-disk=10G mem=2048
+            to: lxc:0
+            num_units: 1
+            options:
+                extra-packages: python-apt postgresql-contrib postgresql-.*-debversion
+                max_connections: 500
+                max_prepared_transactions: 500
+            annotations:
+                "gui-x": "600"
+                "gui-y": "120"
+        haproxy:
+            charm: cs:trusty/haproxy-10
+            constraints: root-disk=10G
+            to: 0
+            expose: True
+            num_units: 1
+            options:
+                enable_monitoring: True
+                monitoring_allowed_cidr: "0.0.0.0/0"
+                monitoring_password: "haproxy"
+                default_timeouts: "queue 60000, connect 5000, client 120000, server 120000"
+                # Don't deploy default haproxy service on port 80
+                services: ""
+                source: backports
+                ssl_cert: SELFSIGNED
+            annotations:
+                "gui-x": "1200"
+                "gui-y": "120"
+        landscape-server:
+            charm: cs:trusty/landscape-server
+            constraints: root-disk=10G mem=2048
+            to: lxc:0
+            num_units: 1
+            options:
+                source: deb http://ppa.launchpad.net/landscape/15.11/ubuntu trusty main
+                key: 4652B4E6
+            annotations:
+                "gui-x": "950"
+                "gui-y": "120"
+    relations:
+        - [landscape-server, rabbitmq-server]
+        - [landscape-server, haproxy]
+        - ["landscape-server:db", "postgresql:db-admin"]

=== added file 'landscape-scalable.yaml'
--- landscape-scalable.yaml	1970-01-01 00:00:00 +0000
+++ landscape-scalable.yaml	2016-01-29 22:57:08 +0000
@@ -0,0 +1,52 @@
+landscape-scalable:
+    series: trusty
+    services:
+        rabbitmq-server:
+            charm: cs:trusty/rabbitmq-server-26
+            constraints: root-disk=10G
+            num_units: 1
+            annotations:
+                "gui-x": "600"
+                "gui-y": "370"
+        postgresql:
+            charm: cs:trusty/postgresql-27
+            constraints: root-disk=10G mem=2048
+            num_units: 1
+            options:
+                extra-packages: python-apt postgresql-contrib postgresql-.*-debversion
+                max_connections: 500
+                max_prepared_transactions: 500
+            annotations:
+                "gui-x": "600"
+                "gui-y": "120"
+        haproxy:
+            charm: cs:trusty/haproxy-10
+            constraints: root-disk=10G
+            expose: True
+            num_units: 1
+            options:
+                enable_monitoring: True
+                monitoring_allowed_cidr: "0.0.0.0/0"
+                monitoring_password: "haproxy"
+                default_timeouts: "queue 60000, connect 5000, client 120000, server 120000"
+                # Don't deploy default haproxy service on port 80
+                services: ""
+                source: backports
+                ssl_cert: SELFSIGNED
+            annotations:
+                "gui-x": "1200"
+                "gui-y": "120"
+        landscape-server:
+            charm: cs:trusty/landscape-server
+            constraints: root-disk=10G mem=2048
+            num_units: 1
+            options:
+                source: deb http://ppa.launchpad.net/landscape/15.11/ubuntu trusty main
+                key: 4652B4E6
+            annotations:
+                "gui-x": "950"
+                "gui-y": "120"
+    relations:
+        - [landscape-server, rabbitmq-server]
+        - [landscape-server, haproxy]
+        - ["landscape-server:db", "postgresql:db-admin"]

=== added file 'landscape-template.jinja2'
--- landscape-template.jinja2	1970-01-01 00:00:00 +0000
+++ landscape-template.jinja2	2016-01-29 22:57:08 +0000
@@ -0,0 +1,94 @@
+landscape-{{ name }}:
+    series: trusty
+    services:
+        rabbitmq-server:
+            charm: cs:trusty/rabbitmq-server-26
+            constraints: root-disk=10G
+            {% if rabbitmq["to"] %}
+            to: {{ rabbitmq["to"] }}
+            {% endif %}
+            num_units: 1
+            annotations:
+                "gui-x": "600"
+                "gui-y": "370"
+        postgresql:
+            charm: cs:trusty/postgresql-27
+            {% if postgresql["memory"] %}
+            constraints: root-disk=10G mem={{ postgresql["memory"] }}
+            {% endif %}
+            {% if postgresql["to"] %}
+            to: {{ postgresql["to"] }}
+            {% endif %}
+            num_units: 1
+            options:
+                extra-packages: python-apt postgresql-contrib postgresql-.*-debversion
+                max_connections: {{ postgresql.max_connections }}
+                max_prepared_transactions: {{ postgresql.max_connections }}
+                {% if postgresql.manual_tuning %}
+                performance_tuning: manual
+                {% endif %}
+                {% if postgresql.shared_buffers %}
+                shared_buffers: {{ postgresql.shared_buffers }}
+                {% endif %}
+                {% if postgresql.checkpoint_segments %}
+                checkpoint_segments: {{ postgresql.checkpoint_segments }}
+                {% endif %}
+                {% if postgresql.maintenance_work_mem %}
+                maintenance_work_mem: {{ postgresql.maintenance_work_mem }}
+                {% endif %}
+                {% if postgresql.work_mem %}
+                work_mem: {{ postgresql.work_mem }}
+                {% endif %}
+                {% if postgresql.effective_cache_size %}
+                effective_cache_size: {{ postgresql.effective_cache_size }}
+                {% endif %}
+            annotations:
+                "gui-x": "600"
+                "gui-y": "120"
+        haproxy:
+            charm: cs:trusty/haproxy-10
+            constraints: root-disk=10G
+            {% if haproxy["to"] %}
+            to: {{ haproxy["to"] }}
+            {% endif %}
+            expose: True
+            num_units: 1
+            options:
+                enable_monitoring: True
+                monitoring_allowed_cidr: "0.0.0.0/0"
+                monitoring_password: "haproxy"
+                default_timeouts: "queue 60000, connect 5000, client 120000, server 120000"
+                # Don't deploy default haproxy service on port 80
+                services: ""
+                source: backports
+                ssl_cert: SELFSIGNED
+            annotations:
+                "gui-x": "1200"
+                "gui-y": "120"
+        landscape-server:
+            {% if landscape["branch"] %}
+            branch: {{ landscape["branch"] }}
+            {% else %}
+            charm: cs:trusty/landscape-server
+            {% endif %}
+            {% if landscape["memory"] %}
+            constraints: root-disk=10G mem={{ landscape["memory"] }}
+            {% endif %}
+            {% if landscape["to"] %}
+            to: {{ landscape["to"] }}
+            {% endif %}
+            num_units: 1
+            options:
+                source: {{ landscape["source"] }}
+                key: {{ landscape["key"] }}
+                {% if landscape["ssl-cert"] %}
+                ssl-cert: {{ landscape["ssl-cert"] }}
+                ssl-key: {{ landscape["ssl-key"] }}
+                {% endif %}
+            annotations:
+                "gui-x": "950"
+                "gui-y": "120"
+    relations:
+        - [landscape-server, rabbitmq-server]
+        - [landscape-server, haproxy]
+        - ["landscape-server:db", "postgresql:db-admin"]

=== added file 'render-bundles'
--- render-bundles	1970-01-01 00:00:00 +0000
+++ render-bundles	2016-01-29 22:57:08 +0000
@@ -0,0 +1,58 @@
+#!/usr/bin/python3
+
+import os
+
+from jinja2 import FileSystemLoader, Environment
+
+DEFAULTS = {
+    "rabbitmq": {},
+    "postgresql": {
+        "max_connections": 500,
+        "max_prepared_transactions": 500,
+        "memory": 2048},
+    "haproxy": {},
+    "landscape": {
+        "memory": 2048,
+        "source": "deb http://ppa.launchpad.net/landscape/15.11/ubuntu trusty main",
+        "key": "4652B4E6"}
+}
+
+FLAVORS = [
+    # scalable
+    {"name": "scalable"},
+
+    # dense
+    {"name": "dense",
+     "rabbitmq": {
+         "to": "lxc:0"},
+     "postgresql": {
+         "to": "lxc:0"},
+     "haproxy": {
+         "to": "0"},
+     "landscape": {
+         "to": "lxc:0"}},
+
+    # dense-maas
+    {"name": "dense-maas",
+     "rabbitmq": {
+         "to": "lxc:0"},
+     "postgresql": {
+         "to": "lxc:0"},
+     "haproxy": {
+         "to": "lxc:0"},
+     "landscape": {
+         "to": "lxc:0"}},
+]
+
+if __name__ == "__main__":
+    environment = Environment(
+        loader=FileSystemLoader("."), trim_blocks=True, lstrip_blocks=True,
+        keep_trailing_newline=True)
+    template = environment.get_template("landscape-template.jinja2")
+    for flavor in FLAVORS:
+        with open("landscape-%s.yaml" % flavor["name"], "w") as fd:
+            context = DEFAULTS.copy()
+            context["name"] = flavor["name"]
+            for key in DEFAULTS.keys():
+                context[key].update(flavor.get(key, {}))
+            fd.write(template.render(context))