From efb53255ea583b0860bbe59c46d588a45b2a6ea2 Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Thu, 4 Jul 2019 15:06:50 +0200 Subject: [PATCH] Disable UCA keystone apache2 site early If the chef-client fails between keystone package installation and the disabling of the default keystone config file from UCA package, then apache2 may end up with conflicting site configurations trying to bind to the same port. Change-Id: Ib52a4d5195f9ef8d7caa8478c8293fe894624ee5 (cherry picked from commit ebfa5bbdb5c821f731ce2c88414b60c4c80d1fee) --- metadata.rb | 2 +- recipes/server-apache.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/metadata.rb b/metadata.rb index e503aae..bae8dd5 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ maintainer_email 'openstack-dev@lists.openstack.org' license 'Apache-2.0' description 'The OpenStack Identity service Keystone.' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '17.1.0' +version '17.1.1' %w(ubuntu redhat centos).each do |os| supports os diff --git a/recipes/server-apache.rb b/recipes/server-apache.rb index 40aa95b..bf655ec 100644 --- a/recipes/server-apache.rb +++ b/recipes/server-apache.rb @@ -103,6 +103,12 @@ service 'keystone' do action [:stop, :disable] end +# disable default keystone config file from UCA package +apache_site 'keystone' do + enable false + only_if { platform_family?('debian') } +end + # create the keystone config directory and set correct permissions directory '/etc/keystone' do owner keystone_user @@ -302,12 +308,6 @@ web_app 'identity' do ciphers node['openstack']['identity']['ssl']['ciphers'] end -# disable default keystone config file from UCA package -apache_site 'keystone' do - enable false - only_if { platform_family?('debian') } -end - # Hack until Apache cookbook has lwrp's for proper use of notify # restart apache2 after keystone if completely configured execute 'Keystone apache restart' do