From 462dd20b3720c4749c300e105566d375c3b4d54f Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Fri, 2 Feb 2018 13:14:21 -0500
Subject: [PATCH] Remove MongoDB integration and transform to using POI
 resources

This patch removes MongoDB beaker tests as this is not a well
tested use-case and sticks to the Swift/SQLalchemy configuration
which is well tested.  It switches Beaker to use the same resources
in integration.

Depends-On: Ic1a4ea20ef65a832a986964fb61e80c4738740b5
Change-Id: I9796a7bb2f25a2df53a1aeeb2814a91ca2c2cbec
---
 spec/acceptance/zaqar_mongo_spec.rb | 76 -----------------------------
 spec/acceptance/zaqar_swift_spec.rb | 45 +----------------
 2 files changed, 2 insertions(+), 119 deletions(-)
 delete mode 100644 spec/acceptance/zaqar_mongo_spec.rb

diff --git a/spec/acceptance/zaqar_mongo_spec.rb b/spec/acceptance/zaqar_mongo_spec.rb
deleted file mode 100644
index f2d2bc0..0000000
--- a/spec/acceptance/zaqar_mongo_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'basic zaqar' do
-
-  context 'default parameters' do
-
-    it 'zaqar with mongo should work with no errors' do
-      pp= <<-EOS
-      include ::openstack_integration
-      include ::openstack_integration::repos
-      include ::openstack_integration::mysql
-      include ::openstack_integration::keystone
-
-      class { '::zaqar::keystone::auth':
-        password => 'a_big_secret',
-      }
-
-      class { '::zaqar::keystone::auth_websocket':
-        password => 'a_big_secret',
-      }
-
-      include ::mongodb::globals
-      include ::mongodb::client
-      class { '::mongodb::server':
-        replset         => 'zaqar',
-        replset_members => ['127.0.0.1:27017'],
-        dbpath_fix      => false,
-      }
-      $zaqar_mongodb_conn_string = 'mongodb://127.0.0.1:27017'
-
-      Mongodb_replset['zaqar'] -> Package['zaqar-common']
-
-      class {'::zaqar::management::mongodb':
-        uri => $zaqar_mongodb_conn_string
-      }
-      class {'::zaqar::messaging::mongodb':
-        uri => $zaqar_mongodb_conn_string
-      }
-      class {'::zaqar::keystone::authtoken':
-        password => 'a_big_secret',
-      }
-      class {'::zaqar::logging':
-        debug => true,
-      }
-      class {'::zaqar':
-        unreliable => true,
-      }
-      class {'::zaqar::server':
-        service_name => 'httpd',
-      }
-      include ::apache
-      class { '::zaqar::wsgi::apache':
-        ssl => false,
-      }
-      # run a second instance using websockets, the Debian system does
-      # not support the use of services to run a second instance.
-      if $::osfamily == 'RedHat' {
-        zaqar::server_instance{ '1':
-          transport => 'websocket'
-        }
-      }
-      EOS
-
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-
-    describe port(8888) do
-      it { is_expected.to be_listening }
-    end
-
-  end
-
-end
diff --git a/spec/acceptance/zaqar_swift_spec.rb b/spec/acceptance/zaqar_swift_spec.rb
index 4dd73a6..3a14d73 100644
--- a/spec/acceptance/zaqar_swift_spec.rb
+++ b/spec/acceptance/zaqar_swift_spec.rb
@@ -11,48 +11,8 @@ describe 'swift zaqar' do
       include ::openstack_integration::mysql
       include ::openstack_integration::keystone
       include ::openstack_integration::swift
-
-      class { '::memcached':
-        listen_ip => '127.0.0.1',
-      }
-
-      class { '::zaqar::keystone::auth':
-        password => 'a_big_secret',
-      }
-
-      class { '::zaqar::keystone::auth_websocket':
-        password => 'a_big_secret',
-      }
-
-      class {'::zaqar::management::sqlalchemy':
-        uri => 'mysql+pymysql://zaqar:a_big_secret@127.0.0.1/zaqar?charset=utf8',
-      }
-      class {'::zaqar::messaging::swift':
-        uri => 'swift://zaqar:a_big_secret:/service'
-      }
-      class {'::zaqar::keystone::authtoken':
-        password => 'a_big_secret',
-      }
-      class {'::zaqar::logging':
-        debug => true,
-      }
-      class {'::zaqar':
-        unreliable => true,
-      }
-      class {'::zaqar::server':
-        service_name => 'httpd',
-      }
-      include ::apache
-      class { '::zaqar::wsgi::apache':
-        ssl => false,
-      }
-      # run a second instance using websockets, the Debian system does
-      # not support the use of services to run a second instance.
-      if $::osfamily == 'RedHat' {
-        zaqar::server_instance{ '1':
-          transport => 'websocket'
-        }
-      }
+      include ::openstack_integration::memcached
+      include ::openstack_integration::zaqar
       EOS
 
 
@@ -68,4 +28,3 @@ describe 'swift zaqar' do
   end
 
 end
-