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

Proposed by Jorge Niedbalski
Status: Superseded
Proposed branch: lp:~niedbalski/charms/trusty/nova-compute/template-cleanup
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-compute/trunk
Diff against target: 39 lines (+0/-8)
2 files modified
templates/grizzly/nova.conf (+0/-4)
templates/havana/nova.conf (+0/-4)
To merge this branch: bzr merge lp:~niedbalski/charms/trusty/nova-compute/template-cleanup
Reviewer Review Type Date Requested Status
James Page Needs Information
Marco Ceppi (community) Abstain
Review via email: mp+216588@code.launchpad.net

This proposal has been superseded by a proposal from 2014-06-02.

Description of the change

Cleanup for lp:1310629

To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

leaving for openstack-charmers

review: Abstain
Revision history for this message
James Page (james-page) wrote :

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

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/grizzly/nova.conf'
2--- templates/grizzly/nova.conf 2014-04-16 08:26:38 +0000
3+++ templates/grizzly/nova.conf 2014-04-21 14:07:31 +0000
4@@ -13,15 +13,11 @@
5 state_path=/var/lib/nova
6 lock_path=/var/lock/nova
7 force_dhcp_release=True
8-iscsi_helper=tgtadm
9 libvirt_use_virtio_for_bridges=True
10-connection_type=libvirt
11-root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
12 verbose=True
13 use_syslog = {{ use_syslog }}
14 ec2_private_dns_show_ip=True
15 api_paste_config=/etc/nova/api-paste.ini
16-volumes_path=/var/lib/nova/volumes
17 enabled_apis=ec2,osapi_compute,metadata
18 auth_strategy=keystone
19 compute_driver=libvirt.LibvirtDriver
20
21=== modified file 'templates/havana/nova.conf'
22--- templates/havana/nova.conf 2014-04-16 08:26:38 +0000
23+++ templates/havana/nova.conf 2014-04-21 14:07:31 +0000
24@@ -13,15 +13,11 @@
25 state_path=/var/lib/nova
26 lock_path=/var/lock/nova
27 force_dhcp_release=True
28-iscsi_helper=tgtadm
29 libvirt_use_virtio_for_bridges=True
30-connection_type=libvirt
31-root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
32 verbose=True
33 use_syslog = {{ use_syslog }}
34 ec2_private_dns_show_ip=True
35 api_paste_config=/etc/nova/api-paste.ini
36-volumes_path=/var/lib/nova/volumes
37 enabled_apis=ec2,osapi_compute,metadata
38 auth_strategy=keystone
39 compute_driver=libvirt.LibvirtDriver

Subscribers

People subscribed via source and target branches