diff --git a/attributes/default.rb b/attributes/default.rb index 6561dc6..892da48 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -154,6 +154,7 @@ when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this openstack-selinux python2-urllib3 ), + 'keystone_apache2_site' => 'keystone', # currently unused on RHEL 'keystone_service' => 'openstack-keystone', 'keystone_process_name' => 'keystone-all', 'package_options' => '', @@ -168,6 +169,7 @@ when 'debian' libapache2-mod-wsgi-py3 python3-keystone ), + 'keystone_apache2_site' => platform?('ubuntu') ? 'keystone' : 'wsgi-keystone', 'keystone_service' => 'keystone', 'keystone_process_name' => 'keystone-all', 'package_overrides' => '', diff --git a/recipes/server-apache.rb b/recipes/server-apache.rb index 05d0ff5..d65c19b 100644 --- a/recipes/server-apache.rb +++ b/recipes/server-apache.rb @@ -90,7 +90,7 @@ service 'keystone' do end # disable default keystone config file from UCA package -apache2_site 'keystone' do +apache2_site platform_options['keystone_apache2_site'] do action :disable only_if { platform_family?('debian') } end