2 files changed, 45 insertions, 79 deletions
diff --git a/spec/classes/tripleo_profile_base_docker_spec.rb b/spec/classes/tripleo_profile_base_docker_spec.rb
index dc5efa7..e0947dc 100644
--- a/spec/classes/tripleo_profile_base_docker_spec.rb
+++ b/spec/classes/tripleo_profile_base_docker_spec.rb
@@ -121,85 +121,6 @@ describe 'tripleo::profile::base::docker' do
       }
     end
 
-    context 'with step 4 and configure_libvirt_polkit disabled' do
-      let(:params) { {
-          :step                    => 4,
-          :configure_libvirt_polkit => false
-      } }
-      it {
-        is_expected.to_not contain_group('docker_nova_group')
-        is_expected.to_not contain_user('docker_nova_user')
-        is_expected.to_not contain_package('polkit')
-        is_expected.to_not contain_file('/etc/polkit-1/rules.d/50-nova.rules')
-      }
-    end
-
-    context 'with step 4 and configure_libvirt_polkit enabled' do
-      let(:params) { {
-          :step                    => 4,
-          :configure_libvirt_polkit => true
-      } }
-      it {
-        is_expected.to contain_group('docker_nova_group').with(
-          :name => 'docker_nova',
-          :gid  => 42436
-        )
-        is_expected.to contain_user('docker_nova_user').with(
-          :name => 'docker_nova',
-          :uid  => 42436,
-          :gid  => 42436,
-          :shell => '/sbin/nologin',
-          :groups => ['nobody']
-        )
-        is_expected.to contain_package('polkit')
-        is_expected.to contain_file('/etc/polkit-1/rules.d/50-nova.rules')
-      }
-    end
-
-    context 'with step 4 and nova_compute service installed' do
-      let(:params) { {
-          :step          => 4,
-          :services_enabled => ['docker', 'nova_compute']
-      } }
-      it {
-        is_expected.to contain_group('docker_nova_group').with(
-          :name => 'docker_nova',
-          :gid  => 42436
-        )
-        is_expected.to contain_user('docker_nova_user').with(
-          :name => 'docker_nova',
-          :uid  => 42436,
-          :gid  => 42436,
-          :shell => '/sbin/nologin',
-          :groups => ['nobody']
-        )
-        is_expected.to contain_package('polkit')
-        is_expected.to contain_file('/etc/polkit-1/rules.d/50-nova.rules')
-      }
-    end
-
-    context 'with step 4 and configure_libvirt_polkit enabled and docker_nova uid' do
-      let(:params) { {
-          :step                    => 4,
-          :configure_libvirt_polkit => true,
-          :docker_nova_uid         => 12345
-      } }
-      it {
-        is_expected.to contain_group('docker_nova_group').with(
-          :name => 'docker_nova',
-          :gid  => 12345
-        )
-        is_expected.to contain_user('docker_nova_user').with(
-          :name => 'docker_nova',
-          :uid  => 12345,
-          :gid  => 12345,
-          :shell => '/sbin/nologin',
-          :groups => ['nobody']
-        )
-        is_expected.to contain_package('polkit')
-        is_expected.to contain_file('/etc/polkit-1/rules.d/50-nova.rules')
-      }
-    end
   end
 
   on_supported_os.each do |os, facts|
diff --git a/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb b/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb
index 0734a0f..65aa8c1 100644
--- a/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb
@@ -69,6 +69,51 @@ eos
         is_expected.to contain_file('/etc/libvirt/qemu/networks/autostart/default.xml').with_ensure('absent')
         is_expected.to contain_file('/etc/libvirt/qemu/networks/default.xml').with_ensure('absent')
         is_expected.to contain_exec('libvirt-default-net-destroy')
+        is_expected.to contain_class('nova::compute::libvirt::config').with_libvirtd_config({
+          "unix_sock_group"    => {"value" => '"libvirt"'},
+          "auth_unix_ro"       => {"value" => '"none"'},
+          "auth_unix_rw"       => {"value" => '"none"'},
+          "unix_sock_ro_perms" => {"value" => '"0777"'},
+          "unix_sock_rw_perms" => {"value" => '"0770"'}
+        })
+      }
+    end
+
+    context 'with step 4 and libvirtd_config' do
+      let(:pre_condition) do
+        <<-eos
+        class { '::tripleo::profile::base::nova':
+          step => #{params[:step]},
+          oslomsg_rpc_hosts => [ '127.0.0.1' ],
+        }
+        class { '::tripleo::profile::base::nova::migration':
+          step => #{params[:step]}
+        }
+        class { '::tripleo::profile::base::nova::migration::client':
+          step => #{params[:step]}
+        }
+        class { '::tripleo::profile::base::nova::compute_libvirt_shared':
+          step => #{params[:step]}
+        }
+eos
+      end
+
+      let(:params) { { :step => 4, :libvirtd_config => { "unix_sock_group" => {"value" => '"foobar"'}} } }
+
+      it {
+        is_expected.to contain_class('tripleo::profile::base::nova::libvirt')
+        is_expected.to contain_class('tripleo::profile::base::nova')
+        is_expected.to contain_class('nova::compute::libvirt::services')
+        is_expected.to contain_file('/etc/libvirt/qemu/networks/autostart/default.xml').with_ensure('absent')
+        is_expected.to contain_file('/etc/libvirt/qemu/networks/default.xml').with_ensure('absent')
+        is_expected.to contain_exec('libvirt-default-net-destroy')
+        is_expected.to contain_class('nova::compute::libvirt::config').with_libvirtd_config({
+          "unix_sock_group"    => {"value" => '"foobar"'},
+          "auth_unix_ro"       => {"value" => '"none"'},
+          "auth_unix_rw"       => {"value" => '"none"'},
+          "unix_sock_ro_perms" => {"value" => '"0777"'},
+          "unix_sock_rw_perms" => {"value" => '"0770"'}
+        })
       }
     end
   end