← Back to branch summary

~bcsaller/charms/trusty/cloudfoundry/progressbar

« back to all changes in this revision

Viewing changes to templates/reconciler-config.conf

  • Committer: Benjamin Saller
  • Date: 2014-11-07 21:10:56 UTC
  • mfrom: (145.1.13 trunk)
  • Revision ID: benjamin.saller@canonical.com-20141107211056-zu7scr425xyv042x
merge mega

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/reconciler-config.conf
2
2
    "juju": {
3
3
        "api_address": "{{api_address}}",
4
4
        "environment": "{{environment}}"
5
 
        {% if environment_uuid %}
6
 
        , "environment_uuid": "{{environment_uuid}}"
 
5
        {%- if environment_uuid %},
 
6
        "environment_uuid": "{{environment_uuid}}"
7
7
        {% endif %}
8
8
    },
9
9
    "credentials": {