Acceptance: use common bits from puppet-openstack-integration

Depends-On: I3cadcaed0629f49d6f8953aa6ed11b6c60a584fe
Change-Id: I3fe94a02d9babfe2895f6ec8535e3ea5b17833e6

spec/acceptance/basic_keystone_spec.rb

@@ -6,8 +6,6 @@ describe 'basic keystone server with resources' do
 
     it 'should work with no errors' do
       pp= <<-EOS
-      Exec { logoutput => 'on_failure' }
-
       # make sure apache is stopped before keystone eventlet
       # in case of wsgi was run before
       class { '::apache':
@@ -15,27 +13,9 @@ describe 'basic keystone server with resources' do
       }
       Service['httpd'] -> Service['keystone']
 
-      # Common resources
+      include ::openstack_integration
-      case $::osfamily {
+      include ::openstack_integration::repos
-        'Debian': {
+      include ::openstack_integration::mysql
-          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': }
 
       # Keystone resources
       class { '::keystone::client': }

spec/acceptance/default_domain_spec.rb

@@ -19,8 +19,6 @@ describe 'basic keystone server with changed domain id' do
   context 'new domain id' do
     let(:pp) do
       <<-EOM
-      Exec { logoutput => 'on_failure' }
-
       # make sure apache is stopped before keystone eventlet
       # in case of wsgi was run before
       class { '::apache':
@@ -28,45 +26,9 @@ describe 'basic keystone server with changed domain id' do
       }
       Service['httpd'] -> Service['keystone']
 
-      # Common resources
+      include ::openstack_integration
-      case $::osfamily {
+      include ::openstack_integration::repos
-        'Debian': {
+      include ::openstack_integration::mysql
-          include ::apt
-          class { '::openstack_extras::repo::debian::ubuntu':
-            release         => 'liberty',
-            repo            => 'proposed',
-            package_require => true,
-          }
-        }
-        'RedHat': {
-          class { '::openstack_extras::repo::redhat::redhat':
-            manage_rdo => false,
-            repo_hash => {
-              'openstack-common-testing' => {
-                'baseurl'  => 'http://cbs.centos.org/repos/cloud7-openstack-common-testing/x86_64/os/',
-                'descr'    => 'openstack-common-testing',
-                'gpgcheck' => 'no',
-              },
-              'openstack-liberty-testing' => {
-                'baseurl'  => 'http://cbs.centos.org/repos/cloud7-openstack-liberty-testing/x86_64/os/',
-                'descr'    => 'openstack-liberty-testing',
-                'gpgcheck' => 'no',
-              },
-              'openstack-liberty-trunk' => {
-                'baseurl'  => 'http://trunk.rdoproject.org/centos7-liberty/current-passed-ci/',
-                'descr'    => 'openstack-liberty-trunk',
-                'gpgcheck' => 'no',
-              },
-            },
-          }
-          package { 'openstack-selinux': ensure => 'latest' }
-        }
-        default: {
-          fail("Unsupported osfamily (${::osfamily})")
-        }
-      }
-
-      class { '::mysql::server': }
 
       # Keystone resources
       class { '::keystone::client': }

spec/acceptance/keystone_federation_identity_provider_spec.rb

@@ -6,57 +6,11 @@ describe 'keystone server running with Apache/WSGI as Identity Provider' do
 
     it 'should work with no errors' do
       pp= <<-EOS
-      Exec { logoutput => 'on_failure' }
+      include ::openstack_integration
+      include ::openstack_integration::repos
+      include ::openstack_integration::mysql
+      include ::openstack_integration::keystone
 
-      # 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': }
-
-      # Keystone resources
-      class { '::keystone::client': }
-      class { '::keystone::cron::token_flush': }
-      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,
-        service_name        => 'httpd',
-      }
-      include ::apache
-      class { '::keystone::wsgi::apache':
-        ssl => false,
-      }
-
-      # "v2" admin and service
-      class { '::keystone::roles::admin':
-        email                  => 'test@example.tld',
-        password               => 'a_big_secret',
-      }
-      class { '::keystone::endpoint':
-        default_domain => 'admin',
-      }
       ::keystone::resource::service_identity { 'beaker-ci':
         service_type        => 'beaker',
         service_description => 'beaker service',

spec/acceptance/keystone_wsgi_apache_spec.rb

@@ -6,58 +6,11 @@ describe 'keystone server running with Apache/WSGI with resources' do
 
     it 'should work with no errors' do
       pp= <<-EOS
-      Exec { logoutput => 'on_failure' }
+      include ::openstack_integration
+      include ::openstack_integration::repos
+      include ::openstack_integration::mysql
+      include ::openstack_integration::keystone
 
-      # 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': }
-
-      # Keystone resources
-      class { '::keystone::client': }
-      class { '::keystone::cron::token_flush': }
-      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,
-        service_name        => 'httpd',
-      }
-      include ::apache
-      class { '::keystone::wsgi::apache':
-        ssl => false,
-      }
-
-      # "v2" admin and service
-      class { '::keystone::roles::admin':
-        email                  => 'test@example.tld',
-        password               => 'a_big_secret',
-      }
-      # Default Keystone endpoints use localhost, default ports and v2.0
-      class { '::keystone::endpoint':
-        default_domain => 'admin',
-      }
       ::keystone::resource::service_identity { 'beaker-ci':
         service_type        => 'beaker',
         service_description => 'beaker service',