]> review.fuel-infra Code Review - puppet-modules/puppet-ceilometer.git/commitdiff
acceptance: remove scenario without apache
authorEmilien Macchi <emilien@redhat.com>
Sun, 15 May 2016 08:34:13 +0000 (10:34 +0200)
committerEmilien Macchi <emilien@redhat.com>
Sun, 15 May 2016 08:34:13 +0000 (10:34 +0200)
The scenario without apache was a transition to test upgrade between non
wsgi with apache to wsgi with apache and was introduced during Liberty
cycle.
The scenario is not useful anymore, as we have a wsgi with apache
scenario working well.
Moreover, we were trying to stop Keystone service, which does not exist
anymore in Mitaka, and removed from distros in Newton. It causes beaker
jobs errors.
Let's remove this test.

Change-Id: I0fc1e758ab41ac47667703b0a305c0871e43f929

spec/acceptance/ceilometer_with_mysql_spec.rb [deleted file]

diff --git a/spec/acceptance/ceilometer_with_mysql_spec.rb b/spec/acceptance/ceilometer_with_mysql_spec.rb
deleted file mode 100644 (file)
index 0172962..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'ceilometer with mysql' do
-
-  context 'default parameters' do
-
-    it 'should work with no errors' do
-      pp= <<-EOS
-      # 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']
-
-      include ::openstack_integration
-      include ::openstack_integration::repos
-      include ::openstack_integration::rabbitmq
-      include ::openstack_integration::mysql
-
-      rabbitmq_user { 'ceilometer':
-        admin    => true,
-        password => 'an_even_bigger_secret',
-        provider => 'rabbitmqctl',
-        require  => Class['rabbitmq'],
-      }
-
-      rabbitmq_user_permissions { 'ceilometer@/':
-        configure_permission => '.*',
-        write_permission     => '.*',
-        read_permission      => '.*',
-        provider             => 'rabbitmqctl',
-        require              => Class['rabbitmq'],
-      }
-
-      # Keystone resources, needed by Ceilometer to run
-      class { '::keystone::db::mysql':
-        password => 'keystone',
-      }
-      class { '::keystone':
-        verbose             => true,
-        debug               => true,
-        database_connection => 'mysql+pymysql://keystone:keystone@127.0.0.1/keystone',
-        admin_token         => 'admin_token',
-        enabled             => true,
-      }
-      class { '::keystone::roles::admin':
-        email    => 'test@example.tld',
-        password => 'a_big_secret',
-      }
-      class { '::keystone::endpoint':
-        public_url => "https://${::fqdn}:5000/",
-        admin_url  => "https://${::fqdn}:35357/",
-      }
-
-      # Ceilometer resources
-      class { '::ceilometer':
-        metering_secret     => 'secrete',
-        rabbit_userid       => 'ceilometer',
-        rabbit_password     => 'an_even_bigger_secret',
-        rabbit_host         => '127.0.0.1',
-        debug               => true,
-        verbose             => true,
-      }
-      class { '::ceilometer::db::mysql':
-        password => 'a_big_secret',
-      }
-      class { '::ceilometer::db':
-        database_connection => 'mysql+pymysql://ceilometer:a_big_secret@127.0.0.1/ceilometer?charset=utf8',
-      }
-      class { '::ceilometer::keystone::auth':
-        password => 'a_big_secret',
-      }
-      class { '::ceilometer::client': }
-      class { '::ceilometer::collector': }
-      class { '::ceilometer::expirer': }
-      class { '::ceilometer::agent::central': }
-      class { '::ceilometer::agent::notification': }
-      class { '::ceilometer::api':
-        enabled               => true,
-        keystone_password     => 'a_big_secret',
-        keystone_identity_uri => 'http://127.0.0.1:35357/',
-      }
-      class { '::ceilometer::dispatcher::gnocchi': }
-      EOS
-
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-
-    describe port(8777) do
-      it { is_expected.to be_listening.with('tcp') }
-    end
-
-    describe cron do
-      it { is_expected.to have_entry('1 0 * * * ceilometer-expirer').with_user('ceilometer') }
-    end
-
-  end
-end