Merge lp:~opnfv-team/maas-deployer/power8 into lp:~maas-deployers/maas-deployer/next

[Narinder Gupta]

Last change as including "-" was not working properly

=== modified file 'maas_deployer/vmaas/templates/cloud-init.cfg'
--- maas_deployer/vmaas/templates/cloud-init.cfg	2016-03-08 13:58:52 +0000
+++ maas_deployer/vmaas/templates/cloud-init.cfg	2016-03-17 06:38:32 +0000
@@ -44,9 +44,9 @@
   # Used to manage KVM instances via libvirt
   - libvirt-bin
   # Below package does not exist on Power8 architecture.
-{% if arch != 'ppc64' -%}
+{% if arch != 'ppc64' %}
   - linux-image-extra-virtual
-{% endif -%}
+{% endif %}
   - jq
   - juju-core
   - juju-deployer