Merge lp:~niedbalski/charms/trusty/nova-compute/template-cleanup into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[James Page]

Cleanup for lp:1310629

[Marco Ceppi (marcoceppi)]

leaving for openstack-charmers

review: Abstain

[James Page (james-page)]

This all looks OK, but has it been tested to ensure that grizzly, havana and icehouse deployments still continue to function OK?

review: Needs Information

[James Page (james-page)]

review: Approve

=== modified file 'templates/grizzly/nova.conf'
--- templates/grizzly/nova.conf	2014-04-16 08:26:38 +0000
+++ templates/grizzly/nova.conf	2014-06-02 09:36:53 +0000
@@ -13,15 +13,11 @@
 state_path=/var/lib/nova
 lock_path=/var/lock/nova
 force_dhcp_release=True
-iscsi_helper=tgtadm
 libvirt_use_virtio_for_bridges=True
-connection_type=libvirt
-root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
 verbose=True
 use_syslog = {{ use_syslog }}
 ec2_private_dns_show_ip=True
 api_paste_config=/etc/nova/api-paste.ini
-volumes_path=/var/lib/nova/volumes
 enabled_apis=ec2,osapi_compute,metadata
 auth_strategy=keystone
 compute_driver=libvirt.LibvirtDriver

=== modified file 'templates/havana/nova.conf'
--- templates/havana/nova.conf	2014-04-16 08:26:38 +0000
+++ templates/havana/nova.conf	2014-06-02 09:36:53 +0000
@@ -13,15 +13,11 @@
 state_path=/var/lib/nova
 lock_path=/var/lock/nova
 force_dhcp_release=True
-iscsi_helper=tgtadm
 libvirt_use_virtio_for_bridges=True
-connection_type=libvirt
-root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
 verbose=True
 use_syslog = {{ use_syslog }}
 ec2_private_dns_show_ip=True
 api_paste_config=/etc/nova/api-paste.ini
-volumes_path=/var/lib/nova/volumes
 enabled_apis=ec2,osapi_compute,metadata
 auth_strategy=keystone
 compute_driver=libvirt.LibvirtDriver