Merge "Include nova::availability_zone in nova::api and nova::conductor"

manifests/api.pp

@@ -229,6 +229,7 @@ class nova::api(
   include ::nova::db
   include ::nova::policy
   include ::nova::keystone::authtoken
+  include ::nova::availability_zone
 
   if !$nova_metadata_wsgi_enabled {
     warning('Running nova metadata api via evenlet is deprecated and will be removed in Stein release.')

manifests/conductor.pp

@@ -39,6 +39,7 @@ class nova::conductor(
   include ::nova::db
   include ::nova::params
   include ::nova::workarounds
+  include ::nova::availability_zone
 
   nova::generic_service { 'conductor':
     enabled        => $enabled,

spec/classes/nova_api_spec.rb

@@ -44,6 +44,8 @@ describe 'nova::api' do
 
       it { is_expected.to contain_nova_config('DEFAULT/instance_name_template').with_ensure('absent')}
 
+      it { is_expected.to contain_class('nova::availability_zone') }
+
       it 'configures various stuff' do
         is_expected.to contain_nova_config('wsgi/api_paste_config').with('value' => 'api-paste.ini')
         is_expected.to contain_nova_config('DEFAULT/osapi_compute_listen').with('value' => '0.0.0.0')

spec/classes/nova_compute_spec.rb

@@ -48,11 +48,7 @@ describe 'nova::compute' do
 
       it { is_expected.to contain_nova_config('DEFAULT/force_raw_images').with(:value => true) }
 
-      it 'configures availability zones' do
+      it { is_expected.to contain_class('nova::availability_zone') }
-        is_expected.to contain_nova_config('DEFAULT/default_availability_zone').with_value('<SERVICE DEFAULT>')
-        is_expected.to contain_nova_config('DEFAULT/default_schedule_zone').with_value('<SERVICE DEFAULT>')
-        is_expected.to contain_nova_config('DEFAULT/internal_service_availability_zone').with_value('<SERVICE DEFAULT>')
-      end
 
       it 'configures vendordata' do
         is_expected.to contain_nova_config('api/vendordata_jsonfile_path').with('value' => '<SERVICE DEFAULT>')

spec/classes/nova_conductor_spec.rb

@@ -20,6 +20,8 @@ describe 'nova::conductor' do
       :ensure    => 'running'
     )}
 
+    it { is_expected.to contain_class('nova::availability_zone') }
+
     context 'with manage_service as false' do
       let :params do
         { :enabled        => true,

spec/classes/nova_scheduler_spec.rb

@@ -25,6 +25,8 @@ describe 'nova::scheduler' do
     it { is_expected.to contain_nova_config('scheduler/query_placement_for_image_type_support').with_value('<SERVICE DEFAULT>') }
     it { is_expected.to contain_nova_config('scheduler/limit_tenants_to_placement_aggregate').with_value('<SERVICE DEFAULT>')}
 
+    it { is_expected.to contain_class('nova::availability_zone') }
+
     context 'with manage_service as false' do
       let :params do
         { :enabled        => true,