Allow dnsmasq_config_file to have attribute overrides

Change-Id: Ide8d1015d1a4455cea680b8a5b5dbb7552c69e34
Closes-Bug: 1327031

CHANGELOG.md

@@ -1,6 +1,9 @@
 # CHANGELOG for cookbook-openstack-compute
 
 This file is used to list changes made in each version of cookbook-openstack-compute.
+## 9.2.4
+* Allow dnsmasq_config_file to have attribute overrides
+
 ## 9.2.3
 * Allow unix_sock_rw_perms to have attribute overrides
 

README.md

@@ -117,6 +117,7 @@ Openstack Compute attributes are in the attribute namespace ["openstack"]["compu
 * `openstack["compute"]["compute"]["adminURL"]` - URL used to access the OS API for admin functions
 * `openstack["compute"]["compute"]["internalURL"]` - URL used to access the OS API for user functions from an internal network
 * `openstack["compute"]["compute"]["publicURL"]` - URL used to access the OS API for user functions from an external network
+* `openstack["compute"]["compute"]["dnsmasq_config_file"]` - Override the default dnsmasq settings with this file
 * `openstack["compute"]["config"]["availability_zone"]` - Nova availability zone.  Usually set at the node level to place a compute node in another az
 * `openstack["compute"]["config"]["default_schedule_zone"]` - The availability zone to schedule instances in when no az is specified in the request
 * `openstack["compute"]["config"]["force_raw_images"]` - Convert all images used as backing files for instances to raw (we default to false)

attributes/default.rb

@@ -39,6 +39,9 @@ default['openstack']['compute']['metadata_workers'] = nil
 # The name of the Chef role that sets up the Keystone Service API
 default['openstack']['compute']['identity_service_chef_role'] = 'os-identity'
 
+# The dnsmasq config file path
+default['openstack']['compute']['dnsmasq_config_file'] = ''
+
 # Common rpc definitions
 default['openstack']['compute']['rpc_thread_pool_size'] = 64
 default['openstack']['compute']['rpc_conn_pool_size'] = 30

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          '9.2.3'
+version          '9.2.4'
 
 recipe 'openstack-compute::api-ec2', 'Installs AWS EC2 compatible API'
 recipe 'openstack-compute::api-metadata', 'Installs the nova metadata package'

spec/nova-common_spec.rb

@@ -67,6 +67,10 @@ describe 'openstack-compute::nova-common' do
         )
       end
 
+      it 'has dnsmasq_config_file' do
+        expect(chef_run).to render_file(file.name).with_content(/^dnsmasq_config_file=$/)
+      end
+
       it 'has default *_path options set' do
         [%r{^log_dir=/var/log/nova$},
          %r{^state_path=/var/lib/nova$},

templates/default/nova.conf.erb

@@ -302,6 +302,9 @@ volume_api_class=<%= node["openstack"]["compute"]["config"]["volume_api_class"]
 # Region name of this node (string value)
 os_region_name=<%= node['openstack']['region'] %>
 
+# Override the default dnsmasq settings with this file (String value)
+dnsmasq_config_file=<%= node['openstack']['compute']['dnsmasq_config_file'] %>
+
 ##### THIRD PARTY ADDITIONS #####
 <% if node["openstack"]["compute"]["plugins"] %>
 <% node["openstack"]["compute"]["plugins"].each do |p| %>