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

diff --git a/spec/acceptance/ceilometer_with_mysql_spec.rb b/spec/acceptance/ceilometer_with_mysql_spec.rb
index 155ac9ba30b1db75446a0827cd9e7e21c70610e3..626e41c7cf2bc82d0749c6bfe087a5d98e91f8a0 100644 (file)
--- 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': {