From e5c43eb60be78b768a7f18aee6e4a34b801aba03 Mon Sep 17 00:00:00 2001 From: Samuel Cassiba Date: Fri, 7 Apr 2017 10:29:01 -0700 Subject: [PATCH] Differentiate between Debian and RHEL for Apache - Apache HTTPD Server is called httpd on RHEL, and apache2 on Debian. This adds that distinction for the cinder-api web service. Change-Id: I457c239f0ff80eb78c49f7a1aae989a8368df80f --- recipes/cinder-common.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/cinder-common.rb b/recipes/cinder-common.rb index 8da3afd..15170db 100644 --- a/recipes/cinder-common.rb +++ b/recipes/cinder-common.rb @@ -86,7 +86,12 @@ end cinder_conf_options = merge_config_options 'block-storage' service 'cinder-apache2' do - service_name 'apache2' + case node['platform_family'] + when 'debian' + service_name 'apache2' + when 'rhel' + service_name 'httpd' + end action :nothing end