Adding in libvirtd.conf parameter overrides

* Adding initial CHANGELOG.md
* Bumping version to 7.0.1

fixes bug: 1203823

Change-Id: I9b02f99d14ded7468358d53b773a2133214d014f

CHANGELOG.md

@@ -0,0 +1,15 @@
+# CHANGELOG for cookbook-openstack-common
+
+This file is used to list changes made in each version of cookbook-openstack-common.
+
+## 7.0.1:
+* Adding attributes for libvirtd.conf settings (max_clients, max_workers,
+  max_requests, max_client_requests).
+
+## 7.0.0:
+* Initial release of cookbook-openstack-common.
+
+- - -
+Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
+
+The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.

README.md

@@ -184,6 +184,10 @@ Libvirt Configuration Attributes
 * `openstack["compute"]["libvirt"]["auth_tcp"]` - Type of authentication your libvirt layer requires
 * `openstack["compute"]["libvirt"]["ssh"]["private_key"]` - Private key to use if using SSH authentication to your libvirt layer
 * `openstack["compute"]["libvirt"]["ssh"]["public_key"]` - Public key to use if using SSH authentication to your libvirt layer
+* `openstack["compute"]["libvirt"]["max_clients"]` - Maximum number of concurrent client connections to allow over all sockets combined. (default: 20)
+* `openstack["compute"]["libvirt"]["max_workers"]` - Maximum number of workers spawned, typically equal to max_clients. (default: 20)
+* `openstack["compute"]["libvirt"]["max_requests"]` - Total global limit on concurrent RPC calls. Should be at least as large as max_workers. (default: 20)
+* `openstack["compute"]["libvirt"]["max_client_requests"]` - Limit on concurrent requests from a single client connection. (default: 5)
 
 Scheduler Configuration Attributes
 ----------------------------------

attributes/default.rb

@@ -173,6 +173,14 @@ default["openstack"]["compute"]["libvirt"]["remove_unused_base_images"] = true
 default["openstack"]["compute"]["libvirt"]["remove_unused_resized_minimum_age_seconds"] = 3600
 default["openstack"]["compute"]["libvirt"]["remove_unused_original_minimum_age_seconds"] = 3600
 default["openstack"]["compute"]["libvirt"]["checksum_base_images"] = false
+# libvirt.max_clients (default: 20)
+default["openstack"]["compute"]["libvirt"]["max_clients"] = 20
+# libvirt.max_workers (default: 20)
+default["openstack"]["compute"]["libvirt"]["max_workers"] = 20
+# libvirt.max_requests (default: 20)
+default["openstack"]["compute"]["libvirt"]["max_requests"] = 20
+# libvirt.max_client_requests (default: 5)
+default["openstack"]["compute"]["libvirt"]["max_client_requests"] = 5
 if node["platform"] == "suse"
   default["openstack"]["compute"]["libvirt"]["group"] = "libvirt"
 else

metadata.rb

@@ -4,7 +4,7 @@ maintainer_email "matt@opscode.com"
 license          "Apache 2.0"
 description      "The OpenStack Compute service Nova."
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "7.0.0"
+version          "7.0.1"
 
 recipe "openstack-compute::api-ec2", "Installs AWS EC2 compatible API"
 recipe "openstack-compute::api-metadata", "Installs the nova metadata package"

spec/libvirt_spec.rb

@@ -59,8 +59,15 @@ describe "openstack-compute::libvirt" do
         expect(sprintf("%o", @file.mode)).to eq "644"
       end
 
-      it "template contents" do
-        pending "TODO: implement"
+      it "has proper processing controls" do
+        expect(@chef_run).to create_file_with_content @file.name,
+          "max_clients = 20"
+        expect(@chef_run).to create_file_with_content @file.name,
+          "max_workers = 20"
+        expect(@chef_run).to create_file_with_content @file.name,
+          "max_requests = 20"
+        expect(@chef_run).to create_file_with_content @file.name,
+          "max_client_requests = 5"
       end
 
       it "notifies libvirt-bin restart" do

templates/default/libvirtd.conf.erb

@@ -248,7 +248,7 @@ auth_tcp = "<%= @auth_tcp %>"
 
 # The maximum number of concurrent client connections to allow
 # over all sockets combined.
-#max_clients = 20
+max_clients = <%= node['openstack']['compute']['libvirt']['max_clients'] %>
 
 
 # The minimum limit sets the number of workers to start up
@@ -257,7 +257,7 @@ auth_tcp = "<%= @auth_tcp %>"
 # Typically you'd want max_workers to equal maximum number
 # of clients allowed
 #min_workers = 5
-#max_workers = 20
+max_workers = <%= node['openstack']['compute']['libvirt']['max_workers'] %>
 
 
 # The number of priority workers. If all workers from above
@@ -273,13 +273,13 @@ auth_tcp = "<%= @auth_tcp %>"
 #
 # XXX this isn't actually enforced yet, only the per-client
 # limit is used so far
-#max_requests = 20
+max_requests = <%= node['openstack']['compute']['libvirt']['max_requests'] %>
 
 # Limit on concurrent requests from a single client
 # connection. To avoid one client monopolizing the server
 # this should be a small fraction of the global max_requests
 # and max_workers parameter
-#max_client_requests = 5
+max_client_requests = <%= node['openstack']['compute']['libvirt']['max_client_requests'] %>
 
 #################################################################
 #