From 6145bf61206381643cdcaaabc285f93d75c0c2e4 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 19 Nov 2015 11:42:21 +0100
Subject: [PATCH] Acceptance: use common bits from puppet-openstack-integration

Change-Id: I191d507b459631eb4c2d0fe1dc52e39d098d77d0
---
 spec/acceptance/basic_swift_spec.rb | 48 +++--------------------------
 1 file changed, 5 insertions(+), 43 deletions(-)

diff --git a/spec/acceptance/basic_swift_spec.rb b/spec/acceptance/basic_swift_spec.rb
index 4fa4b46b..acfee473 100644
--- a/spec/acceptance/basic_swift_spec.rb
+++ b/spec/acceptance/basic_swift_spec.rb
@@ -6,29 +6,11 @@ describe 'basic swift' do
 
     it 'should work with no errors' do
       pp= <<-EOS
-      Exec { logoutput => 'on_failure' }
-
-      # Common resources
-      case $::osfamily {
-        'Debian': {
-          include ::apt
-          class { '::openstack_extras::repo::debian::ubuntu':
-            release         => 'liberty',
-            package_require => true,
-          }
-        }
-        'RedHat': {
-          class { '::openstack_extras::repo::redhat::redhat':
-            release => 'liberty',
-          }
-          package { 'openstack-selinux': ensure => 'latest' }
-        }
-        default: {
-          fail("Unsupported osfamily (${::osfamily})")
-        }
-      }
-
-      class { '::mysql::server': }
+      include ::openstack_integration
+      include ::openstack_integration::repos
+      include ::openstack_integration::rabbitmq
+      include ::openstack_integration::mysql
+      include ::openstack_integration::keystone
 
       package { 'curl': ensure => present }
 
@@ -36,26 +18,6 @@ describe 'basic swift' do
         listen_ip => '127.0.0.1',
       }
 
-      # Keystone resources, needed by Swift to run
-      class { '::keystone::db::mysql':
-        password => 'keystone',
-      }
-      class { '::keystone':
-        verbose             => true,
-        debug               => true,
-        database_connection => 'mysql://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/",
-      }
-
       # Swift resources
       class { '::swift':
         # not sure how I want to deal with this shared secret