From e2da25e624ba32436a1ec1701f344fdd04d7f265 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Wed, 14 Mar 2018 17:30:50 +0800
Subject: [PATCH] Switch acceptance test to use integration classes

Change-Id: I8d0e0df3cff4caec4f9b74e4f2b9af9d99123c04
Depends-On: Iaf66cbc4bf1aebc98edf8df6cfb7f92d2d9e7e6f
---
 spec/acceptance/basic_ec2api_spec.rb | 31 +---------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/spec/acceptance/basic_ec2api_spec.rb b/spec/acceptance/basic_ec2api_spec.rb
index 87a9d73..42e232a 100644
--- a/spec/acceptance/basic_ec2api_spec.rb
+++ b/spec/acceptance/basic_ec2api_spec.rb
@@ -11,36 +11,7 @@ describe 'basic ec2api' do
       include ::openstack_integration::rabbitmq
       include ::openstack_integration::mysql
       include ::openstack_integration::keystone
-
-      # Ec2api resources
-      class { '::ec2api::keystone::auth':
-        password => 'a_big_secret',
-      }
-      class { '::ec2api::db::mysql':
-        password => 'a_big_secret',
-      }
-      case $::osfamily {
-        'Debian': {
-          warning('Ec2api is not yet packaged on Ubuntu systems.')
-        }
-        'RedHat': {
-          class { '::ec2api::db':
-            database_connection => 'mysql://ec2api:a_big_secret@127.0.0.1/ec2api?charset=utf8',
-          }
-          class { '::ec2api::logging':
-            debug => true,
-          }
-          class { '::ec2api': }
-          class { '::ec2api::keystone::authtoken':
-            password => 'a_big_secret',
-          }
-          class { '::ec2api::api': }
-          include ::ec2api::metadata
-        }
-        default: {
-          fail("Unsupported osfamily (${::osfamily})")
-        }
-      }
+      include ::openstack_integration::ec2api
       EOS
 
       # Run it twice to test for idempotency