openstack
/
cookbook-openstack-dashboard
Code Issues Proposed changes

Remove Fedora workaround for SELinux 

Change-Id: Iefe0cd8037c20627d326e0922476f8499b477d77
This commit is contained in:
Samuel Cassiba 2016-03-18 11:41:44 -07:00
parent b44adf823a
commit 08170eb356
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
recipes/apache2-server.rb
View File

@ -63,18 +63,6 @@ include_recipe 'apache2::mod_wsgi'
include_recipe 'apache2::mod_rewrite'
include_recipe 'apache2::mod_ssl' if node['openstack']['dashboard']['use_ssl']
#
# Workaround to re-enable selinux after installing apache on a fedora machine that has
# selinux enabled and is currently permissive and the configuration set to enforcing.
# TODO(breu): get the other one working and this won't be necessary
#
execute 'set-selinux-enforcing' do
command '/sbin/setenforce Enforcing ; restorecon -R /etc/httpd'
action :run
only_if "[ -e /etc/httpd/conf/httpd.conf ] && [ -e /etc/redhat-release ] && [ $(/sbin/sestatus | grep -c '^Current mode:.*permissive') -eq 1 ] && [ $(/sbin/sestatus | grep -c '^Mode from config file:.*enforcing') -eq 1 ]"
end
# delete the openstack-dashboard.conf before reload apache2 service on redhat and centos
# since this file is not valid on those platforms for the apache2 service.
file "#{node['apache']['dir']}/conf.d/openstack-dashboard.conf" do

5
spec/apache2-server-redhat_spec.rb
View File

@ -17,11 +17,6 @@ describe 'openstack-dashboard::apache2-server' do
expect(chef_run).to run_execute(cmd)
end
it 'executes set-selinux-enforcing' do
cmd = '/sbin/setenforce Enforcing ; restorecon -R /etc/httpd'
expect(chef_run).to run_execute(cmd)
end
describe 'certs' do
describe 'get seceret' do
let(:pem) { chef_run.file('/etc/pki/tls/certs/horizon.pem') }