← Back to branch summary

~landscape/landscape-bundles/trunk

« back to all changes in this revision

Viewing changes to landscape-template.jinja2

  • Committer: šŸ¤– Landscape Builder
  • Author(s): Adam Collard
  • Date: 2019-01-24 23:06:51 UTC
  • mfrom: (45.1.2 install-sources)
  • Revision ID: _landscape_builder-20190124230651-hhpcdg71dhv6pwge
MergeĀ install-sourcesĀ [f=]Ā [r=simpoir,landscape-builder]Ā [a=AdamĀ Collard]
UseĀ install_sourcesĀ andĀ install_keys

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:bionic/rabbitmq-server-74
 
4
        charm: cs:bionic/rabbitmq-server-84
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:bionic/postgresql-175
 
14
        charm: cs:bionic/postgresql-187
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:bionic/haproxy-45
 
49
        charm: cs:bionic/haproxy-46
50
50
        {% if haproxy["to"] %}
51
51
        to:
52
52
            - "{{ haproxy["to"] }}"
78
78
        {% endif %}
79
79
        num_units: 1
80
80
        options:
81
 
            {% if landscape["source"] %}
82
 
            source: {{ landscape["source"] }}
83
 
            {% endif %}
84
 
            key: {{ landscape["key"] }}
 
81
            {% if landscape["install_sources"] %}
 
82
            install_sources: {{ landscape["install_sources"] }}
 
83
            {% endif %}
 
84
            {% if landscape["install_keys"] %}
 
85
            install_keys: {{ landscape["install_keys"] }}
 
86
            {% endif %}
85
87
            {% if landscape["ssl-cert"] %}
86
88
            ssl-cert: {{ landscape["ssl-cert"] }}
87
89
            ssl-key: {{ landscape["ssl-key"] }}