From 0fb6851f5fc8a306dc2b850d7336591833f8ad1d Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Sun, 23 Aug 2015 10:36:58 -0400 Subject: [PATCH] acceptance/eventlet: make sure apache is stopped When testing upgrades, we have some cases where we apply the wsgi manifest first and then eventlet. The problem is apache which is started so ceilo-api cannot be started because ports are already in use. So this patch installs Apache on eventlet manifest and makes sure the service is stopped before trying to start ceilo-api with eventlet. Change-Id: I4aae37fcbf60e61c0eb8385dedc950674661b592 --- spec/acceptance/ceilometer_with_mysql_spec.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spec/acceptance/ceilometer_with_mysql_spec.rb b/spec/acceptance/ceilometer_with_mysql_spec.rb index 155ac9b..626e41c 100644 --- a/spec/acceptance/ceilometer_with_mysql_spec.rb +++ b/spec/acceptance/ceilometer_with_mysql_spec.rb @@ -8,6 +8,13 @@ describe 'ceilometer with mysql' do pp= <<-EOS Exec { logoutput => 'on_failure' } + # make sure apache is stopped before ceilometer-api eventlet + # in case of wsgi was run before + class { '::apache': + service_ensure => 'stopped', + } + Service['httpd'] -> Service['keystone'] + # Common resources case $::osfamily { 'Debian': { -- 2.45.2