← Back to branch summary

~landscape/landscape-bundles/trunk

« back to all changes in this revision

Viewing changes to landscape-template.jinja2

  • Committer: Simon Poirier
  • Date: 2021-07-23 20:50:59 UTC
  • mfrom: (54.1.1 bumpitty-bump)
  • Revision ID: simon.poirier@canonical.com-20210723205059-jfgm23dnspcmg2b7
Merge bumpitty-bump [f=] [r=maxiberta] [a=Simon Poirier]
Fix update-charm-revisions regexp to match current charm Id scheme and bump charms revision.

Show diffs side-by-side

added added

removed removed

Lines of Context:
landscape-template.jinja2
1
1
series: bionic
2
2
services:
3
3
    rabbitmq-server:
4
 
        charm: cs:rabbitmq-server-85
 
4
        charm: cs:rabbitmq-server-111
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:postgresql-199
 
14
        charm: cs:postgresql-234
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:haproxy-48
 
49
        charm: cs:haproxy-61
50
50
        {% if haproxy["to"] %}
51
51
        to:
52
52
            - "{{ haproxy["to"] }}"