Merge "Disable starting VMs by libvirt" into folsom

Jenkins · openstack-gerrit · commit 3ca876cf9688 · 2013-06-24T13:35:58.000Z
diff --git a/packstack/puppet/templates/nova_compute.pp b/packstack/puppet/templates/nova_compute.pp
@@ -85,3 +85,10 @@
     }
 }
 Package['libvirt'] -> Service['messagebus'] -> Service['libvirt']
+
+file_line { 'libvirt-guests':
+    path  => '/etc/sysconfig/libvirt-guests',
+    line  => 'ON_BOOT=ignore',
+    match => '^[\s#]*ON_BOOT=.*',
+    require => Class['nova::compute::libvirt']
+}

Original file line number	Diff line number	Diff line change
`@@ -85,3 +85,10 @@`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`Package['libvirt'] -> Service['messagebus'] -> Service['libvirt']`
	`88`	`+`
	`89`	`+file_line { 'libvirt-guests':`
	`90`	`+ path => '/etc/sysconfig/libvirt-guests',`
	`91`	`+ line => 'ON_BOOT=ignore',`
	`92`	`+ match => '^[\s#]ON_BOOT=.',`
	`93`	`+ require => Class['nova::compute::libvirt']`
	`94`	`+}`