Remove the storage_availability_zone settings

* Remove the storage_availability_zone from nova.conf.
* Add some testcases.

Closes-Bug: #1326248
Change-Id: I2887c6fba8a904f46e5f0bd9a8faf9da7ff077ca

CHANGELOG.md

@@ -1,6 +1,8 @@
 # CHANGELOG for cookbook-openstack-compute
 
 This file is used to list changes made in each version of cookbook-openstack-compute.
+## 9.2.7
+* Remove the storage_availability_zone settings
 
 ##9.2.6
 * Allow resize_confirm_window to have attribute overrides

attributes/default.rb

@@ -221,7 +221,6 @@ default['openstack']['compute']['libvirt']['volume_backend'] = nil
 default['openstack']['compute']['libvirt']['rbd']['rbd_secret_name'] = 'rbd_secret_uuid'
 default['openstack']['compute']['libvirt']['rbd']['rbd_user'] = 'cinder'
 default['openstack']['compute']['config']['availability_zone'] = 'nova'
-default['openstack']['compute']['config']['storage_availability_zone'] = 'nova'
 default['openstack']['compute']['config']['default_schedule_zone'] = 'nova'
 default['openstack']['compute']['config']['force_raw_images'] = false
 default['openstack']['compute']['config']['allow_same_net_traffic'] = true

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.6'
+version          '9.2.7'
 
 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

@@ -127,6 +127,13 @@ describe 'openstack-compute::nova-common' do
         end
       end
 
+      it 'has default availability zone options set' do
+        [/^default_availability_zone=nova$/,
+         /^default_schedule_zone=nova/].each do |line|
+          expect(chef_run).to render_file(file.name).with_content(line)
+        end
+      end
+
       it 'has default compute ip and port options set' do
         [/^osapi_compute_listen=127.0.0.1$/,
          /^osapi_compute_listen_port=8774$/].each do |line|

templates/default/nova.conf.erb

@@ -78,7 +78,6 @@ scheduler_available_filters=nova.scheduler.filters.all_filters
 scheduler_default_filters=<%= @scheduler_default_filters %>
 default_availability_zone=<%= node["openstack"]["compute"]["config"]["availability_zone"] %>
 default_schedule_zone=<%= node["openstack"]["compute"]["config"]["default_schedule_zone"] %>
-storage_availability_zone=<%= node["openstack"]["compute"]["config"]["storage_availability_zone"] %>
 
 ##### NETWORK #####