diff --git a/README.md b/README.md index f9cf14b4..aa25d96c 100644 --- a/README.md +++ b/README.md @@ -233,6 +233,11 @@ OSAPI Compute Extentions * `openstack["compute"]["plugins"]` - Array of osapi compute exntesions to add to nova +Miscellaneous Options +--------------------- + +* `openstack["compute"]["misc"]` - Array of bare options for nova.conf (e.g. 'option=value') + EC2 Configuration Attributes ---------------------------- diff --git a/attributes/default.rb b/attributes/default.rb index b9fb4533..11e5551a 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -366,6 +366,7 @@ end # plugins default["openstack"]["compute"]["plugins"] = nil +default["openstack"]["compute"]["misc"] = nil # To disable the EC2 API endpoint, simply remove "ec2," from the list # of enabled API services. diff --git a/metadata.rb b/metadata.rb index 4d818551..8e36b95b 100644 --- a/metadata.rb +++ b/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.2.4" +version "7.3.0" recipe "openstack-compute::api-ec2", "Installs AWS EC2 compatible API" recipe "openstack-compute::api-metadata", "Installs the nova metadata package" diff --git a/templates/default/nova.conf.erb b/templates/default/nova.conf.erb index 3ec8aa1d..767441cc 100644 --- a/templates/default/nova.conf.erb +++ b/templates/default/nova.conf.erb @@ -263,6 +263,12 @@ osapi_compute_extension=<%= p %> <% end %> <% end %> +<% if node["openstack"]["compute"]["misc"] %> +<% node["openstack"]["compute"]["misc"].each do |m| %> +<%= m %> +<% end %> +<% end %> + [conductor] use_local=<%= node["openstack"]["compute"]["conductor"]["use_local"] %>