diff --git a/rpc_deployment/roles/utility_create_configs/templates/cinder_volume_spec.rb.j2 b/rpc_deployment/roles/utility_create_configs/templates/cinder_volume_spec.rb.j2 index 6baff98efb..ca2a4f2a10 100644 --- a/rpc_deployment/roles/utility_create_configs/templates/cinder_volume_spec.rb.j2 +++ b/rpc_deployment/roles/utility_create_configs/templates/cinder_volume_spec.rb.j2 @@ -8,7 +8,3 @@ end describe process('cinder-volume') do it { should be_running } end - -describe kernel_module('dm_snapshot') do - it { should be_loaded } -end diff --git a/rpc_deployment/roles/utility_create_configs/templates/horizon_spec.rb.j2 b/rpc_deployment/roles/utility_create_configs/templates/horizon_spec.rb.j2 index 7d7efdd77c..9e8daeabb8 100644 --- a/rpc_deployment/roles/utility_create_configs/templates/horizon_spec.rb.j2 +++ b/rpc_deployment/roles/utility_create_configs/templates/horizon_spec.rb.j2 @@ -8,7 +8,7 @@ pip_packages = %w( oslo.config MySQL-python ) directories = %w( /opt/horizon /opt/horizon/lib/python2.7/site-packages) -conf_files = %w( /etc/apache2/conf-enabled/openstack-dashboard.conf +conf_files = %w( /etc/apache2/sites-available/openstack-dashboard.conf /opt/horizon/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py ) os_packages.each do |os| @@ -47,6 +47,10 @@ conf_files.each do |f| end end +describe file('/etc/apache2/sites-enabled/openstack-dashboard.conf') do + it { be_linked_to '/etc/apache2/sites-available/openstack-dashboard.conf' } +end + describe service('apache2') do it { should be_enabled } it { should be_running } diff --git a/rpc_deployment/roles/utility_create_configs/templates/neutron_all_spec.rb.j2 b/rpc_deployment/roles/utility_create_configs/templates/neutron_all_spec.rb.j2 index 310bc1c85f..ceba1f5a8d 100644 --- a/rpc_deployment/roles/utility_create_configs/templates/neutron_all_spec.rb.j2 +++ b/rpc_deployment/roles/utility_create_configs/templates/neutron_all_spec.rb.j2 @@ -1,6 +1,6 @@ require 'spec_helper' -os_packages = %w( libpq-dev dnsmasq ) +os_packages = %w( libpq-dev dnsmasq-base ) pip_packages = %w( MySQL-python repoze.lru python-novaclient python-neutronclient python-keystoneclient )