~landscape/landscape-bundles/trunk

« back to all changes in this revision

Viewing changes to landscape-template.jinja2

  • Committer: 🤖 Landscape Builder
  • Author(s): Simon Poirier
  • Date: 2018-07-31 20:43:01 UTC
  • mfrom: (43.1.1 bionic_support)
  • Revision ID: _landscape_builder-20180731204301-g2tfd6gss02yoyuk
Merge bionic_support [f=] [r=waveform,landscape-builder] [a=Simon Poirier]
This branch bumps charms versions to bionic-compatible ones.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
series: xenial
 
1
series: bionic
2
2
services:
3
3
    rabbitmq-server:
4
 
        charm: cs:xenial/rabbitmq-server-5
 
4
        charm: cs:bionic/rabbitmq-server-74
5
5
        {% if rabbitmq["to"] %}
6
6
        to:
7
7
            - {{ rabbitmq["to"] }}
11
11
            "gui-x": "600"
12
12
            "gui-y": "370"
13
13
    postgresql:
14
 
        charm: cs:xenial/postgresql-101
 
14
        charm: cs:bionic/postgresql-175
15
15
        {% if postgresql["memory"] %}
16
16
        constraints: mem={{ postgresql["memory"] }}
17
17
        {% endif %}
46
46
            "gui-x": "600"
47
47
            "gui-y": "120"
48
48
    haproxy:
49
 
        charm: cs:xenial/haproxy-41
 
49
        charm: cs:bionic/haproxy-45
50
50
        {% if haproxy["to"] %}
51
51
        to:
52
52
            - "{{ haproxy["to"] }}"