Merge lp:~ericsnowcurrently/landscape-bundles/drop-rendered-source into lp:landscape-bundles

[Eric Snow]

Do not set an empty "source" field in the rendered bundle.

Apparently Juju chokes when the source field is empty.

Do not set an empty "source" field in the rendered bundle.

Apparently Juju chokes when the source field is empty.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 39
Branch: lp:~ericsnowcurrently/landscape-bundles/drop-rendered-source
Jenkins: https://ci.lscape.net/job/latch-test-trusty/1086/

review: Approve (test results)

[Chad Smith (chad.smith)]

+1 on this changeset

review: Approve

[Adam Collard (adam-collard)]

LGTM +1

review: Approve

=== modified file 'Makefile'
--- Makefile	2017-03-27 22:12:34 +0000
+++ Makefile	2017-03-29 15:19:53 +0000
@@ -14,11 +14,11 @@
 	./charm-store publish-latest ${CHARM_STORE_USER} ${CHANNEL}
 
 .PHONY: render
-render: deps clean
+render: clean
 	@./render-bundles
 
 .PHONY: update-charm-revisions
-update-charm-revisions: deps
+update-charm-revisions:
 	@./update-charm-revisions \
 		$(EXTRA_UPDATE_ARGUMENTS) \
 		postgresql haproxy rabbitmq-server

=== modified file 'landscape-template.jinja2'
--- landscape-template.jinja2	2017-03-16 17:37:29 +0000
+++ landscape-template.jinja2	2017-03-29 15:19:53 +0000
@@ -81,7 +81,9 @@
         {% endif %}
         num_units: 1
         options:
+            {% if landscape["source"] %}
             source: {{ landscape["source"] }}
+            {% endif %}
             key: {{ landscape["key"] }}
             {% if landscape["ssl-cert"] %}
             ssl-cert: {{ landscape["ssl-cert"] }}