Use new infra_spec_helper for gem dependencies

Change-Id: I6da4799d7461956f2f14b2c63f63e778e4f180c8

Gemfile

@@ -1,22 +1,9 @@
 source 'https://rubygems.org'
 
-group :development, :unit_tests do
-  gem 'puppetlabs_spec_helper', :require => false
-  gem 'rspec-puppet', '~> 2.1.0', :require => false
-  gem 'google-api-client', '0.9.4'
-
-  gem 'json'
-  gem 'webmock'
-end
-
-group :system_tests do
-  gem 'beaker-rspec', :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
+group :development, :test, :system_tests do
+  gem 'puppet-openstack_infra_spec_helper',
+      :git     => 'https://git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper',
+      :require => false
 end
 
 # vim:ft=ruby

manifests/elasticsearch_node.pp

@@ -29,7 +29,7 @@ class openstackci::elasticsearch_node (
   $es_indices_cleanup_period = '10 days ago',
 ) {
 
-  class { 'logstash::elasticsearch': }
+  class { '::logstash::elasticsearch': }
 
   class { '::elasticsearch':
     es_template_config => {
@@ -60,7 +60,7 @@ class openstackci::elasticsearch_node (
     environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin',
   }
 
-  class { 'logstash::curator':
+  class { '::logstash::curator':
     keep_for_days  => '10',
   }
 

manifests/jenkins_master.pp

@@ -99,7 +99,7 @@ class openstackci::jenkins_master (
 
   if $manage_jenkins_jobs == true {
     if ! defined(Class['project_config']) {
-      class { 'project_config':
+      class { '::project_config':
         url  => $project_config_repo,
         base => $project_config_base,
       }

manifests/logstash.pp

@@ -24,29 +24,29 @@ class openstackci::logstash (
   $log_processor_config,
 ) {
 
-  class { 'logstash::web':
+  class { '::logstash::web':
     frontend            => 'kibana',
     discover_nodes      => $discover_nodes,
     proxy_elasticsearch => true,
   }
 
-  class { 'log_processor': }
+  class { '::log_processor': }
 
-  class { 'log_processor::client':
+  class { '::log_processor::client':
     config_file => $log_processor_config,
     statsd_host => $statsd_host,
   }
 
-  include subunit2sql
+  include ::subunit2sql
 
-  class { 'subunit2sql::server':
+  class { '::subunit2sql::server':
     db_host => $subunit2sql_db_host,
     db_pass => $subunit2sql_db_pass,
   }
 
-  include simpleproxy
+  include ::simpleproxy
 
-  class { 'simpleproxy::server':
+  class { '::simpleproxy::server':
     db_host            => $subunit2sql_db_host,
   }
 

manifests/logstash_worker.pp

@@ -40,11 +40,11 @@ class openstackci::logstash_worker (
     content => "JAVA_ARGS='${indexer_java_args}'"
   }
 
-  class { 'logstash::indexer':
+  class { '::logstash::indexer':
     conf_template => $indexer_conf_template,
   }
 
-  include log_processor
+  include ::log_processor
   log_processor::worker { $log_processor_workers:
     config_file => $log_processor_config,
   }

manifests/nodepool.pp

@@ -39,7 +39,7 @@ class openstackci::nodepool (
 ) {
 
   if ! defined(Class['project_config']) {
-    class { 'project_config':
+    class { '::project_config':
       url  => $project_config_repo,
     }
   }

manifests/subunit_worker.pp

@@ -22,7 +22,7 @@ class openstackci::subunit_worker (
   $subunit2sql_config_file,
 ) {
 
-  include subunit2sql
+  include ::subunit2sql
   subunit2sql::worker { 'A':
     config_file => $subunit2sql_config_file,
     db_host     => $subunit2sql_db_host,

manifests/zuul_scheduler.pp

@@ -56,7 +56,7 @@ class openstackci::zuul_scheduler(
 ) {
 
   if ! defined(Class['project_config']) {
-    class { 'project_config':
+    class { '::project_config':
       url      => $project_config_repo,
       revision => $project_config_revision,
       base     => $project_config_base,